diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-04-07 01:42:49 -0400 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-04-07 01:42:49 -0400 |
| commit | 2b79fa82872c55368167fc7433cb28a2369f5191 (patch) | |
| tree | 89220f5f198ad73f2cad47a1878a70e381a7cee5 /nova/api | |
| parent | 26d2a6ca8939156e8957e31dd17906070283ff24 (diff) | |
test provider fw rules at the virt/ipteables layer.
lowercase protocol names in admin api to match what the firewall driver expects.
add provider fw rule chain in iptables6 as well.
fix a couple of small typos and copy-paste errors.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/admin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py index 0b27854ef..c0c2bcd0d 100644 --- a/nova/api/ec2/admin.py +++ b/nova/api/ec2/admin.py @@ -356,11 +356,11 @@ class AdminController(object): IPy.IP(cidr) rule = {'cidr': cidr} tcp_rule = rule.copy() - tcp_rule.update({"protocol": "TCP", "from_port": 1, "to_port": 65535}) + tcp_rule.update({"protocol": "tcp", "from_port": 1, "to_port": 65535}) udp_rule = rule.copy() - udp_rule.update({"protocol": "UDP", "from_port": 1, "to_port": 65535}) + udp_rule.update({"protocol": "udp", "from_port": 1, "to_port": 65535}) icmp_rule = rule.copy() - icmp_rule.update({"protocol": "ICMP", "from_port": -1, + icmp_rule.update({"protocol": "icmp", "from_port": -1, "to_port": None}) rules_added = 0 if not self._provider_fw_rule_exists(context, tcp_rule): |