[v5,2/3] tests/vm: Let subclasses disable IPv6
diff mbox series

Message ID 20191018181705.17957-3-ehabkost@redhat.com
State New
Headers show
Series
  • tests/vm: netbsd autoinstall, with IPv6 disabled
Related show

Commit Message

Eduardo Habkost Oct. 18, 2019, 6:17 p.m. UTC
The mechanism will be used to work around issues related to IPv6
on the netbsd image builder.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 tests/vm/basevm.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé Oct. 18, 2019, 7:06 p.m. UTC | #1
On 10/18/19 8:17 PM, Eduardo Habkost wrote:
> The mechanism will be used to work around issues related to IPv6
> on the netbsd image builder.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>   tests/vm/basevm.py | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
> index b5d1479bee..2929de23aa 100755
> --- a/tests/vm/basevm.py
> +++ b/tests/vm/basevm.py
> @@ -57,6 +57,8 @@ class BaseVM(object):
>       arch = "#arch"
>       # command to halt the guest, can be overridden by subclasses
>       poweroff = "poweroff"
> +    # enable IPv6 networking
> +    ipv6 = True
>       def __init__(self, debug=False, vcpus=None):
>           self._guest = None
>           self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
> @@ -81,7 +83,8 @@ class BaseVM(object):
>           self._args = [ \
>               "-nodefaults", "-m", "4G",
>               "-cpu", "max",
> -            "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22",
> +            "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22" +
> +                       (",ipv6=no" if not self.ipv6 else ""),
>               "-device", "virtio-net-pci,netdev=vnet",
>               "-vnc", "127.0.0.1:0,to=20"]
>           if vcpus and vcpus > 1:
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thomas Huth Oct. 21, 2019, 8:27 a.m. UTC | #2
On 18/10/2019 20.17, Eduardo Habkost wrote:
> The mechanism will be used to work around issues related to IPv6
> on the netbsd image builder.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  tests/vm/basevm.py | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
> index b5d1479bee..2929de23aa 100755
> --- a/tests/vm/basevm.py
> +++ b/tests/vm/basevm.py
> @@ -57,6 +57,8 @@ class BaseVM(object):
>      arch = "#arch"
>      # command to halt the guest, can be overridden by subclasses
>      poweroff = "poweroff"
> +    # enable IPv6 networking
> +    ipv6 = True
>      def __init__(self, debug=False, vcpus=None):
>          self._guest = None
>          self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
> @@ -81,7 +83,8 @@ class BaseVM(object):
>          self._args = [ \
>              "-nodefaults", "-m", "4G",
>              "-cpu", "max",
> -            "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22",
> +            "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22" +
> +                       (",ipv6=no" if not self.ipv6 else ""),
>              "-device", "virtio-net-pci,netdev=vnet",
>              "-vnc", "127.0.0.1:0,to=20"]
>          if vcpus and vcpus > 1:
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Patch
diff mbox series

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index b5d1479bee..2929de23aa 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -57,6 +57,8 @@  class BaseVM(object):
     arch = "#arch"
     # command to halt the guest, can be overridden by subclasses
     poweroff = "poweroff"
+    # enable IPv6 networking
+    ipv6 = True
     def __init__(self, debug=False, vcpus=None):
         self._guest = None
         self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
@@ -81,7 +83,8 @@  class BaseVM(object):
         self._args = [ \
             "-nodefaults", "-m", "4G",
             "-cpu", "max",
-            "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22",
+            "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22" +
+                       (",ipv6=no" if not self.ipv6 else ""),
             "-device", "virtio-net-pci,netdev=vnet",
             "-vnc", "127.0.0.1:0,to=20"]
         if vcpus and vcpus > 1: