From 4fc8ebb857be71916e8a6d6fa1d512935671cf43 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Fri, 10 Feb 2012 17:21:52 -0600 Subject: [PATCH] remove all instance_type db lookups from network increases efficiency without requiring extra parameters Change-Id: I858067afb94007c8e71748373873f7cc8bd54662 --- nova/tests/test_quantum.py | 12 ++++++------ nova/tests/test_xenapi.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py index 2e60bbc4..1605c49d 100644 --- a/nova/tests/test_quantum.py +++ b/nova/tests/test_quantum.py @@ -277,7 +277,7 @@ class QuantumNovaIPAMTestCase(QuantumNovaTestCase): self.net_man.driver.kill_dhcp = func1 nw_info = self.net_man.allocate_for_instance(ctx.elevated(), instance_id=instance_ref['id'], host="", - instance_type_id=instance_ref['instance_type_id'], + rxtx_factor=3, project_id=project_id) self.assertEquals(len(nw_info), 2) @@ -346,7 +346,7 @@ class QuantumNovaIPAMTestCase(QuantumNovaTestCase): self.net_man.driver.kill_dhcp = func1 nw_info = self.net_man.allocate_for_instance(ctx, instance_id=instance_ref['id'], host="", - instance_type_id=instance_ref['instance_type_id'], + rxtx_factor=3, project_id=project_id, requested_networks=requested_networks) @@ -410,7 +410,7 @@ class QuantumNovaMACGenerationTestCase(QuantumNovaTestCase): {"project_id": project_id}) nw_info = self.net_man.allocate_for_instance(ctx, instance_id=instance_ref['id'], host="", - instance_type_id=instance_ref['instance_type_id'], + rxtx_factor=3, project_id=project_id, requested_networks=requested_networks) self.assertEqual(nw_info[0]['address'], fake_mac) @@ -431,7 +431,7 @@ class QuantumNovaMACGenerationTestCase(QuantumNovaTestCase): {"project_id": project_id}) nw_info = self.net_man.allocate_for_instance(ctx, instance_id=instance_ref['id'], host="", - instance_type_id=instance_ref['instance_type_id'], + rxtx_factor=3, project_id=project_id, requested_networks=requested_networks) self.assertEqual(nw_info[0]['address'], fake_mac) @@ -468,7 +468,7 @@ class QuantumNovaPortSecurityTestCase(QuantumNovaTestCase): _instrumented_create_and_attach_port nw_info = self.net_man.allocate_for_instance(ctx, instance_id=instance_ref['id'], host="", - instance_type_id=instance_ref['instance_type_id'], + rxtx_factor=3, project_id=project_id, requested_networks=requested_networks) self.assertEqual(nw_info[0]['address'], fake_mac) @@ -502,7 +502,7 @@ class QuantumNovaPortSecurityTestCase(QuantumNovaTestCase): _instrumented_create_and_attach_port nw_info = self.net_man.allocate_for_instance(ctx, instance_id=instance_ref['id'], host="", - instance_type_id=instance_ref['instance_type_id'], + rxtx_factor=3, project_id=project_id, requested_networks=requested_networks) self.assertEqual(nw_info[0]['address'], fake_mac) diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 281e00fc..ec10defe 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -642,7 +642,7 @@ class XenAPIVMTestCase(test.TestCase): instance_uuid="00000000-0000-0000-0000-000000000000", host=FLAGS.host, vpn=None, - instance_type_id=1, + rxtx_factor=3, project_id=self.project_id) self._test_spawn(glance_stubs.FakeGlance.IMAGE_MACHINE, glance_stubs.FakeGlance.IMAGE_KERNEL,