|
@@ -48,7 +48,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
|
|
|
"Network CIDR %s does not contain the expected value."
|
|
"Network CIDR %s does not contain the expected value."
|
|
|
% net.cidr_block)
|
|
% net.cidr_block)
|
|
|
|
|
|
|
|
- cidr = '10.0.1.0/24'
|
|
|
|
|
|
|
+ cidr = '10.0.20.0/24'
|
|
|
sn = net.create_subnet(
|
|
sn = net.create_subnet(
|
|
|
label=subnet_label, cidr_block=cidr,
|
|
label=subnet_label, cidr_block=cidr,
|
|
|
zone=helpers.get_provider_test_data(self.provider,
|
|
zone=helpers.get_provider_test_data(self.provider,
|
|
@@ -92,7 +92,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
|
|
|
|
|
|
|
|
def create_subnet(label):
|
|
def create_subnet(label):
|
|
|
return self.provider.networking.subnets.create(
|
|
return self.provider.networking.subnets.create(
|
|
|
- label=label, network=net, cidr_block="10.2.0.0/24",
|
|
|
|
|
|
|
+ label=label, network=net, cidr_block="10.0.10.0/24",
|
|
|
zone=helpers.get_provider_test_data(
|
|
zone=helpers.get_provider_test_data(
|
|
|
self.provider, 'placement'))
|
|
self.provider, 'placement'))
|
|
|
|
|
|
|
@@ -168,7 +168,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
|
|
|
label=label, cidr_block='10.0.0.0/16')
|
|
label=label, cidr_block='10.0.0.0/16')
|
|
|
router = self.provider.networking.routers.create(label=label,
|
|
router = self.provider.networking.routers.create(label=label,
|
|
|
network=net)
|
|
network=net)
|
|
|
- cidr = '10.1.0.0/24'
|
|
|
|
|
|
|
+ cidr = '10.0.15.0/24'
|
|
|
sn = net.create_subnet(label=label, cidr_block=cidr,
|
|
sn = net.create_subnet(label=label, cidr_block=cidr,
|
|
|
zone=helpers.get_provider_test_data(
|
|
zone=helpers.get_provider_test_data(
|
|
|
self.provider, 'placement'))
|
|
self.provider, 'placement'))
|
almahmoud