summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-04-22 00:24:52 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-04-22 00:26:28 +0200
commit406b8a60f1d4f8fb9083c3c0972e07e6e7125c49 (patch)
treebbf844e1524bb25d5e0dc69ffa396d18d0fdd72b
parent67a905abf5f14d1a28ae61c4f5f0c15250e85e0e (diff)
Bypass NoneType errors when creating router in rally
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 <cedric.ollivier@orange.com> (cherry picked from commit f0870e3735324941f5bd77243f36f9214cd531ac)
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 2b775bca0..94cd1d6f9 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')