refactored tests

2 files changed, 24 insertions, 16 deletions

diff --git a/nova/network/manager.py b/nova/network/manager.py
index 8b86bc036..b21667def 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -666,9 +666,8 @@ class NetworkManager(manager.SchedulerDependentManager):
             significant_bits_v6 = 64
             network_size_v6 = 1 << 64
 
-        count = 0
-        for req_cidr in req_cidrs:
-            count = count + 1
+        for index in range(len(req_cidrs)):
+            req_cidr = req_cidrs[index]
             net = {}
             net['bridge'] = bridge
             net['bridge_interface'] = bridge_interface
@@ -680,12 +679,12 @@ class NetworkManager(manager.SchedulerDependentManager):
             net['broadcast'] = str(req_cidr.broadcast)
             net['dhcp_start'] = str(req_cidr[2])
             if num_networks > 1:
-                net['label'] = '%s_%d' % (label, count)
+                net['label'] = '%s_%d' % (label, index)
             else:
                 net['label'] = label
 
             if FLAGS.use_ipv6:
-                start_v6 = count * network_size_v6
+                start_v6 = index * network_size_v6
                 cidr_v6 = '%s/%s' % (fixed_net_v6[start_v6],
                                      significant_bits_v6)
                 net['cidr_v6'] = cidr_v6
@@ -701,7 +700,7 @@ class NetworkManager(manager.SchedulerDependentManager):
                 # this bit here is for vlan-manager
                 del net['dns1']
                 del net['dns2']
-                vlan = kwargs['vlan_start'] + count
+                vlan = kwargs['vlan_start'] + index
                 net['vpn_private_address'] = str(req_cidr[2])
                 net['dhcp_start'] = str(req_cidr[3])
                 net['vlan'] = vlan
@@ -709,7 +708,7 @@ class NetworkManager(manager.SchedulerDependentManager):
 
                 # NOTE(vish): This makes ports unique accross the cloud, a more
                 #             robust solution would be to make them uniq per ip
-                net['vpn_public_port'] = kwargs['vpn_start'] + count
+                net['vpn_public_port'] = kwargs['vpn_start'] + index
 
             network = self.db.network_create_safe(context, net)
             if network:
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index 424b5f098..9c808c6db 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -254,7 +254,9 @@ class CommonNetworkTestCase(test.TestCase):
                 raise exception.NetworkNotFoundForCidr()
 
             def network_create_safe(self, context, net):
-                return {'foo': 'bar'}
+                fakenet = {}
+                fakenet['id'] = 999
+                return fakenet
 
             def network_get_all(self, context):
                 raise exception.NoNetworksFound()
@@ -266,6 +268,9 @@ class CommonNetworkTestCase(test.TestCase):
         def deallocate_fixed_ip(self, context, address):
             self.deallocate_called = address
 
+    def fake_create_fixed_ips(self, context, network_id):
+        return None 
+
     def test_remove_fixed_ip_from_instance(self):
         manager = self.FakeNetworkManager()
         manager.remove_fixed_ip_from_instance(None, 99, '10.0.0.1')
@@ -372,16 +377,11 @@ class CommonNetworkTestCase(test.TestCase):
     def test_create_networks(self):
         cidr = '192.168.0.0/24'
         manager = self.FakeNetworkManager()
-        self.mox.StubOutWithMock(manager.db, 'network_create_safe')
-        ignore = mox.IgnoreArg()
-        fakecidr= {'id': 1, 'cidr': cidr}
-        manager.db.network_create_safe(ignore, ignore).AndReturn(fakecidr)
-        self.mox.StubOutWithMock(manager, '_create_fixed_ips')
-        manager._create_fixed_ips(ignore, ignore).AndReturn('foo')
-        self.mox.ReplayAll()
+        self.stubs.Set(manager, '_create_fixed_ips',
+                                self.fake_create_fixed_ips)
         args = [None, 'foo', cidr, None, 1, 256, 'fd00::/48', None, None,
                 None]
-        # making it to the end, without err, is enough validation
+        result = manager.create_networks(*args)
         self.assertEqual(manager.create_networks(*args), None)
 
     def test_create_networks_cidr_already_used(self):
@@ -394,3 +394,12 @@ class CommonNetworkTestCase(test.TestCase):
         args = [None, 'foo', '192.168.0.0/24', None, 1, 256,
                  'fd00::/48', None, None, None]
         self.assertRaises(ValueError, manager.create_networks, *args)
+
+    def test_create_networks_many(self):
+        cidr = '192.168.0.0/16'
+        manager = self.FakeNetworkManager()
+        self.stubs.Set(manager, '_create_fixed_ips',
+                                self.fake_create_fixed_ips)
+        args = [None, 'foo', cidr, None, 10, 256, 'fd00::/48', None, None,
+                None]
+        self.assertEqual(manager.create_networks(*args), None)