fix bug 816630

Off by one error fixed With test case Change-Id: I5060c0a59949d69d6f859a01e7cf5fa8e0227d8a
openstack · Nov 3, 2011 · a6a7e93 · a6a7e93
1 parent 005db2d
commit a6a7e93
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/nova/network/manager.py b/nova/network/manager.py
@@ -1018,7 +1018,7 @@ def _create_fixed_ips(self, context, network_id):
         ips = []
         for index in range(num_ips):
             address = str(project_net[index])
-            if index < bottom_reserved or num_ips - index < top_reserved:
+            if index < bottom_reserved or num_ips - index <= top_reserved:
                 reserved = True
             else:
                 reserved = False

diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
@@ -201,6 +201,17 @@ def test_validate_networks(self):
         self.mox.ReplayAll()
         self.network.validate_networks(self.context, requested_networks)
 
+    def test_validate_reserved(self):
+        context_admin = context.RequestContext('testuser', 'testproject',
+                                              is_admin=True)
+        nets = self.network.create_networks(context_admin, 'fake',
+                                       '192.168.0.0/24', False, 1,
+                                       256, None, None, None, None )
+        self.assertEqual(1, len(nets))
+        network = nets[0]
+        self.assertEqual(3, db.network_count_reserved_ips(context_admin,
+                        network['id']))
+
     def test_validate_networks_none_requested_networks(self):
         self.network.validate_networks(self.context, None)