diff --git a/.mailmap b/.mailmap
index 9e3badb65fcd..5fcd106eda5a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -60,6 +60,7 @@
 <sandy.walsh@rackspace.com> <sandy@sandywalsh.com>
 <sleepsonthefloor@gmail.com> <root@tonbuntu>
 <soren.hansen@rackspace.com> <soren@linux2go.dk>
+<soren@linux2go.dk> <sorhanse@cisco.com>
 <throughnothing@gmail.com> <will.wolf@rackspace.com>
 <tim.simpson@rackspace.com> <tim.simpson4@gmail.com>
 <todd@ansolabs.com> <todd@lapex>
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index ef2374fca590..937c4786750a 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -1871,6 +1871,10 @@ class IptablesFirewallTestCase(test.TestCase):
 'to_port': 81,
 'group_id': src_secgroup['id']})
 
+ db.security_group_rule_create(admin_ctxt,
+ {'parent_group_id': secgroup['id'],
+ 'group_id': src_secgroup['id']})
+
 db.instance_add_security_group(admin_ctxt, instance_ref['uuid'],
 secgroup['id'])
 db.instance_add_security_group(admin_ctxt, src_instance_ref['uuid'],
@@ -1951,6 +1955,9 @@ class IptablesFirewallTestCase(test.TestCase):
 '--dports 80:81 -s %s' % ip['address'])
 self.assertTrue(len(filter(regex.match, self.out_rules))> 0,
 "TCP port 80/81 acceptance rule wasn't added")
+ regex = re.compile('-A .* -j ACCEPT -s %s' % ip['address'])
+ self.assertTrue(len(filter(regex.match, self.out_rules))> 0,
+ "Protocol/port-less acceptance rule wasn't added")
 
 regex = re.compile('-A .* -j ACCEPT -p tcp '
 '-m multiport --dports 80:81 -s 192.168.10.0/24')
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py
index be6a0f7c972b..89559a829200 100644
--- a/nova/virt/firewall.py
+++ b/nova/virt/firewall.py
@@ -331,7 +331,11 @@ class IptablesFirewallDriver(FirewallDriver):
 else:
 fw_rules = ipv6_rules
 
- protocol = rule.protocol.lower()
+ protocol = rule.protocol
+
+ if protocol:
+ protocol = rule.protocol.lower()
+
 if version == 6 and protocol == 'icmp':
 protocol = 'icmpv6'
 
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/nova/commit/bbdf82c5ec3e31a5dc43948291c4f37ce1098714.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/nova/commit/bbdf82c5ec3e31a5dc43948291c4f37ce1098714.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>