diff options
| author | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-26 16:12:52 -0500 |
|---|---|---|
| committer | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-26 16:12:52 -0500 |
| commit | 095a70607ca0ec39fe7c04927794862823a1fcfe (patch) | |
| tree | ae1307fbbe50e50c4caa24062dc1fc1039d3679d | |
| parent | 166591fda420cb39d38738e4cef77a8b030b9591 (diff) | |
| parent | 0c77697789079cc1971c27cc4952d07c34e30ac7 (diff) | |
Merged with http://bazaar.launchpad.net/~vishvananda/nova/lp703037
| -rw-r--r-- | nova/tests/test_virt.py | 13 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index f6800e3d9..12fb01596 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -474,6 +474,19 @@ class NWFilterTestCase(test.TestCase): 'project_id': 'fake'}) inst_id = instance_ref['id'] + ip = '10.11.12.13' + + network_ref = db.project_get_network(self.context, + 'fake') + + fixed_ip = {'address': ip, + 'network_id': network_ref['id']} + + admin_ctxt = context.get_admin_context() + db.fixed_ip_create(admin_ctxt, fixed_ip) + db.fixed_ip_update(admin_ctxt, ip, {'allocated': True, + 'instance_id': instance_ref['id']}) + def _ensure_all_called(): instance_filter = 'nova-instance-%s' % instance_ref['name'] secgroup_filter = 'nova-secgroup-%s' % self.security_group['id'] diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 29e318cfd..36733764a 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -1129,10 +1129,6 @@ class NWFilterFirewall(FirewallDriver): return - def apply_instance_filter(self, instance): - """No-op. Everything is done in prepare_instance_filter""" - pass - def refresh_security_group_rules(self, security_group_id): return self._define_filter( self.security_group_to_nwfilter_xml(security_group_id)) |