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-26 19:06:17 +0200 |
| commit | 0d2f5c72e2d8d4fee8df94f66bdaae4bb5b0412f (patch) | |
| tree | 1b024110193896bab212727d59119b72b59a0d4b | |
| parent | 86ebddb4e13faa86664fe262766ee09cfe3754e4 (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>
(cherry picked from commit cb7e4e1e0687b79a0528ebe6a37683049d960210)
| -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 a388a3cd6..158929b2c 100644 --- 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 20044f8c0..67d6659f3 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): |