From 3b2a8b516fd9dbd08563c709e14323d571b8efee Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 23 Feb 2011 01:52:07 -0800
Subject: speed up network tests

---
 nova/tests/__init__.py     | 3 ++-
 nova/tests/fake_flags.py   | 4 ++--
 nova/tests/test_network.py | 8 +++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index 5472bdaf2..5afd9389d 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -48,7 +48,8 @@ def setup():
     ctxt = context.get_admin_context()
     network_manager.VlanManager().create_networks(ctxt,
                                                   FLAGS.fixed_range,
-                                                  5, 16,
+                                                  FLAGS.num_networks,
+                                                  FLAGS.network_size,
                                                   FLAGS.fixed_range_v6,
                                                   FLAGS.vlan_start,
                                                   FLAGS.vpn_start,
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 575fefff6..a8291a968 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -29,8 +29,8 @@ FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver'
 flags.DECLARE('network_size', 'nova.network.manager')
 flags.DECLARE('num_networks', 'nova.network.manager')
 flags.DECLARE('fake_network', 'nova.network.manager')
-FLAGS.network_size = 16
-FLAGS.num_networks = 5
+FLAGS.network_size = 8
+FLAGS.num_networks = 2
 FLAGS.fake_network = True
 flags.DECLARE('num_shelves', 'nova.volume.driver')
 flags.DECLARE('blades_per_shelf', 'nova.volume.driver')
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index 00f9323f3..ccb5298bd 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -42,15 +42,13 @@ class NetworkTestCase(test.TestCase):
         #             flags in the corresponding section in nova-dhcpbridge
         self.flags(connection_type='fake',
                    fake_call=True,
-                   fake_network=True,
-                   network_size=16,
-                   num_networks=5)
+                   fake_network=True)
         self.manager = manager.AuthManager()
         self.user = self.manager.create_user('netuser', 'netuser', 'netuser')
         self.projects = []
         self.network = utils.import_object(FLAGS.network_manager)
         self.context = context.RequestContext(project=None, user=self.user)
-        for i in range(5):
+        for i in range(FLAGS.num_networks):
             name = 'project%s' % i
             project = self.manager.create_project(name, 'netuser', name)
             self.projects.append(project)
@@ -192,7 +190,7 @@ class NetworkTestCase(test.TestCase):
         first = self._create_address(0)
         lease_ip(first)
         instance_ids = []
-        for i in range(1, 5):
+        for i in range(1, FLAGS.num_networks):
             instance_ref = self._create_instance(i, mac=utils.generate_mac())
             instance_ids.append(instance_ref['id'])
             address = self._create_address(i, instance_ref['id'])
-- 
cgit