Minor change about subnet pool

It reverts the subnet pool to 192.168.120.0/24.
It avoids conflicts with default CPE private subnets.

It also increases cloudify spawning timeout.

Change-Id: I70183cede0690c2cbc74f9c30a38892d829db2c9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit cb7e4e1e0687b79a0528ebe6a37683049d960210)

diff --git a/functest/core/cloudify.py b/functest/core/cloudify.py
index a388a3c..158929b 100644 (file)
--- a/functest/core/cloudify.py
+++ b/functest/core/cloudify.py
@@ -31,7 +31,7 @@ class Cloudify(singlevm.SingleVm2):
     flavor_disk = 40
     username = 'centos'
     ssh_connect_loops = 12
-    create_server_timeout = 240
+    create_server_timeout = 300
     ports = [80, 443, 5671, 53333]
 
     def __init__(self, **kwargs):

diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py
index 20044f8..67d6659 100644 (file)
--- a/functest/core/tenantnetwork.py
+++ b/functest/core/tenantnetwork.py
@@ -122,7 +122,7 @@ class TenantNetwork1(testcase.TestCase):
     """
 
     __logger = logging.getLogger(__name__)
-    cidr = '192.168.0.0/24'
+    cidr = '192.168.120.0/24'
     shared_network = False
 
     def __init__(self, **kwargs):