summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorEldar Nugaev <enugaev@griddynamics.com>2011-04-22 03:25:07 +0400
committerEldar Nugaev <enugaev@griddynamics.com>2011-04-22 03:25:07 +0400
commit3f2f5d8944d7c66276628a704a3d2bcdbdd3a2c1 (patch)
tree94ca11a664fc4e9724486962ff22f5912525d0fa /nova/tests
parent5fc608bb60dc9c086d8c2c7ac69c0dd6719c061f (diff)
parent1b56402bff72e74d0c058e6aeb2a30de3fc492d2 (diff)
merge with trunk
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_virt.py6
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'