diff options
| author | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-05 10:25:16 -0500 |
|---|---|---|
| committer | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-05 10:25:16 -0500 |
| commit | 28bf4e2df324db79a81a853d39cb5912985c2e45 (patch) | |
| tree | e0b37f9cdce266049fff4b0b7873baf20c2cf286 | |
| parent | b14a8975dece3be18216cf2ad790be0c8fd22f7a (diff) | |
Fixed bug in nova_project_filter_v6
| -rw-r--r-- | nova/virt/libvirt_conn.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 521ac97fc..a592f5d6b 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -114,14 +114,17 @@ def _get_net_and_mask(cidr): net = IPy.IP(cidr) return str(net.net()), str(net.netmask()) + def _get_net_and_prefixlen(cidr): net = IPy.IP(cidr) return str(net.net()), str(net.prefixlen()) + def _get_ip_version(cidr): net = IPy.IP(cidr) return int(net.version()) + class LibvirtConnection(object): def __init__(self, read_only): @@ -559,7 +562,8 @@ class LibvirtConnection(object): "<parameter name=\"PROJNETV6\" " "value=\"%s\" />\n" "<parameter name=\"PROJMASKV6\" " - "value=\"%s\" />\n") % (net, mask, net_v6, prefixlen_v6) + "value=\"%s\" />\n") % \ + (net, mask, net_v6, prefixlen_v6) else: extra_params = "\n" @@ -838,7 +842,8 @@ class NWFilterFirewall(object): def nova_project_filter_v6(self): retval = "<filter name='nova-project-v6' chain='ipv6'>" for protocol in ['tcp-ipv6', 'udp-ipv6', 'icmpv6']: - retval += """<rule action='accept' direction='in' priority='200'> + retval += """<rule action='accept' direction='inout' + priority='200'> <%s srcipaddr='$PROJNETV6' srcipmask='$PROJMASKV6' /> </rule>""" % (protocol) |