diff options
| -rw-r--r-- | nova/virt/libvirt_conn.py | 2 | ||||
| -rw-r--r-- | smoketests/user_smoketests.py | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index a592f5d6b..1f3c69f65 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -912,7 +912,7 @@ class NWFilterFirewall(object): if(FLAGS.use_ipv6 and version == 6): net, prefixlen = _get_net_and_prefixlen(rule.cidr) rule_xml += "<%s srcipaddr='%s' srcipmask='%s' " % \ - (v6protocol[rrule.protocol], net, prefixlen) + (v6protocol[rule.protocol], net, prefixlen) else: net, mask = _get_net_and_mask(rule.cidr) rule_xml += "<%s srcipaddr='%s' srcipmask='%s' " % \ diff --git a/smoketests/user_smoketests.py b/smoketests/user_smoketests.py index f4ee30542..181acdfe5 100644 --- a/smoketests/user_smoketests.py +++ b/smoketests/user_smoketests.py @@ -162,13 +162,18 @@ class InstanceTests(UserSmokeTestCase): 'ping -c1 %s' % self.data['private_ip']) if status == 0: break - if FLAGS.use_ipv6: + else: + self.fail('could not ping instance') + + if FLAGS.use_ipv6: + for x in xrange(120): + # ping waits for 1 second status, output = commands.getstatusoutput( 'ping6 -c1 %s' % self.data['ip_v6']) if status == 0: break - else: - self.fail('could not ping instance') + else: + self.fail('could not ping instance') def test_005_can_ssh_to_private_ip(self): for x in xrange(30): |