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)

diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 2b775bc..94cd1d6 100644 (file)
--- 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')