commit 69b8225a74ee74589124e3d09c402b00a464442d
author Jenkins <jenkins@review.openstack.org> Fri May 16 18:36:23 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri May 16 18:36:24 2014 +0000
tree 18905efdc13d1145026c1d0fff58e9cde8999c31
parent e8e8cb12581a1c7f10c809d205bdc05a42c02a2c
parent b1e5889f7efa73930e662710c3854896365ce6df

Merge "Fix subnet api test case for non-default cidr"

tempest/api/network/test_networks.py

diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py
index 660b376..ac0fd11 100644
--- a/tempest/api/network/test_networks.py
+++ b/tempest/api/network/test_networks.py
@@ -234,6 +234,8 @@
 
     @test.attr(type='smoke')
     def test_create_delete_subnet_without_gw(self):
+        net = netaddr.IPNetwork(CONF.network.tenant_network_cidr)
+        gateway_ip = str(netaddr.IPAddress(net.first + 1))
         name = data_utils.rand_name('network-')
         resp, body = self.client.create_network(name=name)
         self.assertEqual('201', resp['status'])
@@ -241,7 +243,7 @@
         net_id = network['id']
         subnet = self.create_subnet(network)
         # Verifies Subnet GW in IPv4
-        self.assertEqual(subnet['gateway_ip'], '10.100.0.1')
+        self.assertEqual(subnet['gateway_ip'], gateway_ip)
         # Delete network and subnet
         resp, body = self.client.delete_network(net_id)
         self.assertEqual('204', resp['status'])