diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-20 13:31:50 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-20 13:31:50 +0200 |
commit | cb7e4e1e0687b79a0528ebe6a37683049d960210 (patch) | |
tree | 4f8eb3ce35410572d06626a78c1735b6c2422308 | |
parent | 51f3e7a3cc4409fb9dda03bffa1252a8660f38b0 (diff) |
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>
-rw-r--r-- | functest/core/cloudify.py | 2 | ||||
-rw-r--r-- | functest/core/tenantnetwork.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/functest/core/cloudify.py b/functest/core/cloudify.py index 655c5f5be..3bb630d80 100644 --- a/functest/core/cloudify.py +++ b/functest/core/cloudify.py @@ -31,7 +31,7 @@ class Cloudify(singlevm.SingleVm2): flavor_disk = 50 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 fdf0ab132..b118893de 100644 --- 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): |