openstack/nova
Code Issues Proposed changes

fix more tests

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-07-26 22:55:58 -07:00
parent fc87e8acff
commit 6a757bbbbd
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/tests/test_libvirt.py
View File

@@ -1065,11 +1065,13 @@ class IptablesFirewallTestCase(test.TestCase):
instance = db.instance_get(self.context, inst_id)
ip = '10.11.12.13'
network_ref = db.project_get_network(self.context, 'fake')
network_ref = db.project_get_networks(self.context, 'fake')[0]
fixed_ip = {'address': ip, 'network_id': network_ref['id']}
db.fixed_ip_create(admin_ctxt, fixed_ip)
db.fixed_ip_update(admin_ctxt, ip, {'allocated': True,
'instance_id': inst_id})
_setup_networking(inst_id, ip)
self.fw.setup_basic_filtering(instance)
self.fw.prepare_instance_filter(instance)
self.fw.apply_instance_filter(instance)
@@ -1086,7 +1088,7 @@ class IptablesFirewallTestCase(test.TestCase):
instance_ref = self._create_instance_ref()
nw_info = _create_network_info(1)
ip = '10.11.12.13'
network_ref = db.project_get_network(self.context, 'fake')
network_ref = db.project_get_networks(self.context, 'fake')[0]
admin_ctxt = context.get_admin_context()
fixed_ip = {'address': ip, 'network_id': network_ref['id']}
db.fixed_ip_create(admin_ctxt, fixed_ip)
@@ -1288,7 +1290,7 @@ class NWFilterTestCase(test.TestCase):
db.fixed_ip_update(admin_ctxt, ip, {'allocated': True,
'instance_id': inst_id})
self._setup_networking(instance_ref['id'], ip=ip)
_setup_networking(instance_ref['id'], ip=ip)
def _ensure_all_called():
instance_filter = 'nova-instance-%s-%s' % (instance_ref['name'],
@@ -1341,7 +1343,7 @@ class NWFilterTestCase(test.TestCase):
instance = db.instance_get(self.context, inst_id)
ip = '10.11.12.13'
network_ref = db.project_get_network(self.context, 'fake')
network_ref = db.project_get_networks(self.context, 'fake')[0]
fixed_ip = {'address': ip, 'network_id': network_ref['id']}
db.fixed_ip_create(admin_ctxt, fixed_ip)
db.fixed_ip_update(admin_ctxt, ip, {'allocated': True,
@@ -1350,6 +1352,7 @@ class NWFilterTestCase(test.TestCase):
self.fw.prepare_instance_filter(instance)
self.fw.apply_instance_filter(instance)
original_filter_count = len(fakefilter.filters)
raise Exception(original_filter_count)
self.fw.unfilter_instance(instance)
# should undefine 2 filters: instance and instance-secgroup

8
nova/virt/libvirt/netutils.py
View File

@@ -25,6 +25,7 @@ import netaddr
from nova import context
from nova import db
from nova import exception
from nova import flags
from nova import ipv6
from nova import utils
@@ -55,10 +56,13 @@ def get_network_info(instance):
# we should cache network_info
admin_context = context.get_admin_context()
try:
fixed_ips = db.fixed_ip_get_by_instance(admin_context, instance['id'])
except exception.FixedIpNotFoundForInstance:
fixed_ips = []
vifs = db.virtual_interface_get_by_instance(admin_context, instance['id'])
networks = db.network_get_all_by_instance(admin_context,
instance['id'])
flavor = db.instance_type_get(admin_context,
instance['instance_type_id'])
network_info = []