diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-21 16:18:49 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-21 16:18:49 -0400 |
| commit | 18388b26c0e28df103d07ad0cc28fd9bfaab6416 (patch) | |
| tree | 526b9004c1f6c7eeb82dcff2aa96a6b4f7596bac /nova/tests | |
| parent | 6c037c5c639249556fcadd871d8af91760b50e90 (diff) | |
| parent | bec71bed9450d13202fdd7f54946e1376b271a2c (diff) | |
Merged trunk and fixed api servers conflict.
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_virt.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index aeaea91c7..0a0c7a958 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -618,7 +618,8 @@ class IptablesFirewallTestCase(test.TestCase): instance_ref = db.instance_create(self.context, {'user_id': 'fake', 'project_id': 'fake', - 'mac_address': '56:12:12:12:12:12'}) + 'mac_address': '56:12:12:12:12:12', + 'instance_type_id': 1}) ip = '10.11.12.13' network_ref = db.project_get_network(self.context, @@ -841,7 +842,8 @@ class NWFilterTestCase(test.TestCase): instance_ref = db.instance_create(self.context, {'user_id': 'fake', 'project_id': 'fake', - 'mac_address': '00:A0:C9:14:C8:29'}) + 'mac_address': '00:A0:C9:14:C8:29', + 'instance_type_id': 1}) inst_id = instance_ref['id'] ip = '10.11.12.13' |