x/python-ganttclient
Code Issues Proposed changes

speed up network tests

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-02-23 01:52:07 -08:00
parent b7594a750f
commit 91c62838e2
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/fake_flags.py
View File

@@ -29,8 +29,8 @@ FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver'
flags.DECLARE('network_size', 'nova.network.manager') flags.DECLARE('network_size', 'nova.network.manager')
flags.DECLARE('num_networks', 'nova.network.manager') flags.DECLARE('num_networks', 'nova.network.manager')
flags.DECLARE('fake_network', 'nova.network.manager') flags.DECLARE('fake_network', 'nova.network.manager')
FLAGS.network_size = 16 FLAGS.network_size = 8
FLAGS.num_networks = 5 FLAGS.num_networks = 2
FLAGS.fake_network = True FLAGS.fake_network = True
flags.DECLARE('num_shelves', 'nova.volume.driver') flags.DECLARE('num_shelves', 'nova.volume.driver')
flags.DECLARE('blades_per_shelf', 'nova.volume.driver') flags.DECLARE('blades_per_shelf', 'nova.volume.driver')

8
nova/tests/test_network.py
View File

@@ -42,15 +42,13 @@ class NetworkTestCase(test.TestCase):
# flags in the corresponding section in nova-dhcpbridge # flags in the corresponding section in nova-dhcpbridge
self.flags(connection_type='fake', self.flags(connection_type='fake',
fake_call=True, fake_call=True,
fake_network=True, fake_network=True)
network_size=16,
num_networks=5)
self.manager = manager.AuthManager() self.manager = manager.AuthManager()
self.user = self.manager.create_user('netuser', 'netuser', 'netuser') self.user = self.manager.create_user('netuser', 'netuser', 'netuser')
self.projects = [] self.projects = []
self.network = utils.import_object(FLAGS.network_manager) self.network = utils.import_object(FLAGS.network_manager)
self.context = context.RequestContext(project=None, user=self.user) 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 name = 'project%s' % i
project = self.manager.create_project(name, 'netuser', name) project = self.manager.create_project(name, 'netuser', name)
self.projects.append(project) self.projects.append(project)
@@ -192,7 +190,7 @@ class NetworkTestCase(test.TestCase):
first = self._create_address(0) first = self._create_address(0)
lease_ip(first) lease_ip(first)
instance_ids = [] 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_ref = self._create_instance(i, mac=utils.generate_mac())
instance_ids.append(instance_ref['id']) instance_ids.append(instance_ref['id'])
address = self._create_address(i, instance_ref['id']) address = self._create_address(i, instance_ref['id'])