diff options
| author | Eldar Nugaev <enugaev@griddynamics.com> | 2011-05-01 20:43:06 -0700 |
|---|---|---|
| committer | Eldar Nugaev <enugaev@griddynamics.com> | 2011-05-01 20:43:06 -0700 |
| commit | 30d7b7d17f2f08fa35417b03e47cfb7d4c8b24b2 (patch) | |
| tree | fd1e873d05f7d96c943d5f510914c20422f9f3a7 | |
| parent | 103ed1e5ca489de0064decc91bccf25dfbadc761 (diff) | |
| download | nova-30d7b7d17f2f08fa35417b03e47cfb7d4c8b24b2.tar.gz nova-30d7b7d17f2f08fa35417b03e47cfb7d4c8b24b2.tar.xz nova-30d7b7d17f2f08fa35417b03e47cfb7d4c8b24b2.zip | |
small changes in libvirt tests
| -rw-r--r-- | nova/tests/test_virt.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index b8a2b5c7a..47432baef 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -44,7 +44,9 @@ def _concurrency(wait, done, target): done.send() -def _create_network_info(count=1, ipv6=True): +def _create_network_info(count=1, ipv6=None): + if ipv6 is None: + ipv6 = FLAGS.use_ipv6 fake = 'fake' fake_ip = '0.0.0.0/0' fake_ip_2 = '0.0.0.1/0' @@ -830,14 +832,14 @@ class IptablesFirewallTestCase(test.TestCase): def test_filters_for_instance_with_ip_v6(self): self.flags(use_ipv6=True) - network_info = _create_network_info(ipv6=FLAGS.use_ipv6) + network_info = _create_network_info() rulesv4, rulesv6 = self.fw._filters_for_instance("fake", network_info) self.assertEquals(len(rulesv4), 2) self.assertEquals(len(rulesv6), 3) def test_filters_for_instance_without_ip_v6(self): self.flags(use_ipv6=False) - network_info = _create_network_info(ipv6=FLAGS.use_ipv6) + network_info = _create_network_info() rulesv4, rulesv6 = self.fw._filters_for_instance("fake", network_info) self.assertEquals(len(rulesv4), 2) self.assertEquals(len(rulesv6), 0) |