diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-27 21:57:13 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-27 21:57:13 +0200 |
| commit | e705b666679ecccfc3e91c8029f2c646849509ee (patch) | |
| tree | 92996b763a47caced8da5a9118439236394c92c2 | |
| parent | ab31fa628f4d9148aae8d42bbb41d721716c18e3 (diff) | |
| download | nova-e705b666679ecccfc3e91c8029f2c646849509ee.tar.gz nova-e705b666679ecccfc3e91c8029f2c646849509ee.tar.xz nova-e705b666679ecccfc3e91c8029f2c646849509ee.zip | |
Recreate ensure_security_group_filter. Needed for refresh.
| -rw-r--r-- | nova/virt/libvirt_conn.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 558854c38..a7370e036 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -448,7 +448,7 @@ class LibvirtConnection(object): def refresh_security_group(self, security_group_id): fw = NWFilterFirewall(self._conn) - fw.ensure_security_group_filter(security_group_id, override=True) + fw.ensure_security_group_filter(security_group_id) class NWFilterFirewall(object): @@ -543,16 +543,20 @@ class NWFilterFirewall(object): ) % instance['name'] for security_group in instance.security_groups: - yield self._define_filter( - self.security_group_to_nwfilter_xml(security_group['id'])) + yield self.ensure_security_group_filter(security_group['id']) nwfilter_xml += (" <filterref filter='nova-secgroup-%d' />\n" - ) % security_group.id + ) % security_group['id'] nwfilter_xml += "</filter>" yield self._define_filter(nwfilter_xml) return + def ensure_security_group_filter(self, security_group_id): + return self._define_filter( + self.security_group_to_nwfilter_xml(security_group_id)) + + def security_group_to_nwfilter_xml(self, security_group_id): security_group = db.security_group_get({}, security_group_id) rule_xml = "" |