From f0870e3735324941f5bd77243f36f9214cd531ac Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 22 Apr 2018 00:24:52 +0200 Subject: Bypass NoneType errors when creating router in rally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It converts private subnet name to str as it's mandary till [1]. It could be reverted as soon as [2] is merged in snaps. [1] https://gerrit.opnfv.org/gerrit/#/c/56091/ [2] https://gerrit.opnfv.org/gerrit/#/c/56171/ Change-Id: Ia728415207f8ecb5b5ac55982f82337c45671c4c Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/rally/rally.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 248086e15..8048eddeb 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -80,7 +80,7 @@ class RallyBase(testcase.TestCase): TEMP_DIR = os.path.join(RALLY_DIR, "var") RALLY_PRIVATE_NET_NAME = getattr(config.CONF, 'rally_network_name') - RALLY_PRIVATE_SUBNET_NAME = getattr(config.CONF, 'rally_subnet_name') + RALLY_PRIVATE_SUBNET_NAME = str(getattr(config.CONF, 'rally_subnet_name')) RALLY_PRIVATE_SUBNET_CIDR = getattr(config.CONF, 'rally_subnet_cidr') RALLY_ROUTER_NAME = getattr(config.CONF, 'rally_router_name') -- cgit 1.2.3-korg