x/python-ganttclient
Code Issues Proposed changes

Merge "remove all instance_type db lookups from network"

Browse Source
This commit is contained in:
Jenkins
2012-02-11 03:23:51 +00:00
committed by Gerrit Code Review
parent f36b8496dd 4fc8ebb857
commit 34666538e6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/tests/test_quantum.py
View File

@@ -277,7 +277,7 @@ class QuantumNovaIPAMTestCase(QuantumNovaTestCase):
self.net_man.driver.kill_dhcp = func1 self.net_man.driver.kill_dhcp = func1
nw_info = self.net_man.allocate_for_instance(ctx.elevated(), nw_info = self.net_man.allocate_for_instance(ctx.elevated(),
instance_id=instance_ref['id'], host="", instance_id=instance_ref['id'], host="",
instance_type_id=instance_ref['instance_type_id'], rxtx_factor=3,
project_id=project_id) project_id=project_id)
self.assertEquals(len(nw_info), 2) self.assertEquals(len(nw_info), 2)
@@ -346,7 +346,7 @@ class QuantumNovaIPAMTestCase(QuantumNovaTestCase):
self.net_man.driver.kill_dhcp = func1 self.net_man.driver.kill_dhcp = func1
nw_info = self.net_man.allocate_for_instance(ctx, nw_info = self.net_man.allocate_for_instance(ctx,
instance_id=instance_ref['id'], host="", instance_id=instance_ref['id'], host="",
instance_type_id=instance_ref['instance_type_id'], rxtx_factor=3,
project_id=project_id, project_id=project_id,
requested_networks=requested_networks) requested_networks=requested_networks)
@@ -410,7 +410,7 @@ class QuantumNovaMACGenerationTestCase(QuantumNovaTestCase):
{"project_id": project_id}) {"project_id": project_id})
nw_info = self.net_man.allocate_for_instance(ctx, nw_info = self.net_man.allocate_for_instance(ctx,
instance_id=instance_ref['id'], host="", instance_id=instance_ref['id'], host="",
instance_type_id=instance_ref['instance_type_id'], rxtx_factor=3,
project_id=project_id, project_id=project_id,
requested_networks=requested_networks) requested_networks=requested_networks)
self.assertEqual(nw_info[0]['address'], fake_mac) self.assertEqual(nw_info[0]['address'], fake_mac)
@@ -431,7 +431,7 @@ class QuantumNovaMACGenerationTestCase(QuantumNovaTestCase):
{"project_id": project_id}) {"project_id": project_id})
nw_info = self.net_man.allocate_for_instance(ctx, nw_info = self.net_man.allocate_for_instance(ctx,
instance_id=instance_ref['id'], host="", instance_id=instance_ref['id'], host="",
instance_type_id=instance_ref['instance_type_id'], rxtx_factor=3,
project_id=project_id, project_id=project_id,
requested_networks=requested_networks) requested_networks=requested_networks)
self.assertEqual(nw_info[0]['address'], fake_mac) self.assertEqual(nw_info[0]['address'], fake_mac)
@@ -468,7 +468,7 @@ class QuantumNovaPortSecurityTestCase(QuantumNovaTestCase):
_instrumented_create_and_attach_port _instrumented_create_and_attach_port
nw_info = self.net_man.allocate_for_instance(ctx, nw_info = self.net_man.allocate_for_instance(ctx,
instance_id=instance_ref['id'], host="", instance_id=instance_ref['id'], host="",
instance_type_id=instance_ref['instance_type_id'], rxtx_factor=3,
project_id=project_id, project_id=project_id,
requested_networks=requested_networks) requested_networks=requested_networks)
self.assertEqual(nw_info[0]['address'], fake_mac) self.assertEqual(nw_info[0]['address'], fake_mac)
@@ -502,7 +502,7 @@ class QuantumNovaPortSecurityTestCase(QuantumNovaTestCase):
_instrumented_create_and_attach_port _instrumented_create_and_attach_port
nw_info = self.net_man.allocate_for_instance(ctx, nw_info = self.net_man.allocate_for_instance(ctx,
instance_id=instance_ref['id'], host="", instance_id=instance_ref['id'], host="",
instance_type_id=instance_ref['instance_type_id'], rxtx_factor=3,
project_id=project_id, project_id=project_id,
requested_networks=requested_networks) requested_networks=requested_networks)
self.assertEqual(nw_info[0]['address'], fake_mac) self.assertEqual(nw_info[0]['address'], fake_mac)

2
nova/tests/test_xenapi.py
View File

@@ -642,7 +642,7 @@ class XenAPIVMTestCase(test.TestCase):
instance_uuid="00000000-0000-0000-0000-000000000000", instance_uuid="00000000-0000-0000-0000-000000000000",
host=FLAGS.host, host=FLAGS.host,
vpn=None, vpn=None,
instance_type_id=1, rxtx_factor=3,
project_id=self.project_id) project_id=self.project_id)
self._test_spawn(glance_stubs.FakeGlance.IMAGE_MACHINE, self._test_spawn(glance_stubs.FakeGlance.IMAGE_MACHINE,
glance_stubs.FakeGlance.IMAGE_KERNEL, glance_stubs.FakeGlance.IMAGE_KERNEL,