Re: [PATCH v2 05/10] Acceptance Tests: add port redirection for ssh by default

[Cleber Rosa]

On Thu, Mar 25, 2021 at 02:57:48PM -0300, Wainer dos Santos Moschetta wrote:
> Hi,
> 
> On 3/24/21 6:10 AM, Auger Eric wrote:
> > Hi Cleber,
> > 
> > On 3/23/21 11:15 PM, Cleber Rosa wrote:
> > > For users of the LinuxTest class, let's set up the VM with the port
> > > redirection for SSH, instead of requiring each test to set the same
> > also sets the network device to virtio-net. This may be worth mentioning
> > here in the commit msg.
> > > arguments.
> > > 
> > > Signed-off-by: Cleber Rosa <crosa@redhat.com>
> > Reviewed-by: Eric Auger <eric.auger@redhat.com>
> > 
> > Thanks
> > 
> > Eric
> > 
> > > ---
> > >   tests/acceptance/avocado_qemu/__init__.py | 4 +++-
> > >   tests/acceptance/virtiofs_submounts.py    | 4 ----
> > >   2 files changed, 3 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/tests/acceptance/avocado_qemu/__init__.py 
> > > b/tests/acceptance/avocado_qemu/__init__.py
> > > index 67f75f66e5..e75b002c70 100644
> > > --- a/tests/acceptance/avocado_qemu/__init__.py
> > > +++ b/tests/acceptance/avocado_qemu/__init__.py
> > > @@ -309,10 +309,12 @@ class LinuxTest(Test, LinuxSSHMixIn):
> > >       timeout = 900
> > >       chksum = None
> > > -    def setUp(self, ssh_pubkey=None):
> > > +    def setUp(self, ssh_pubkey=None, network_device_type='virtio-net'):
> > >           super(LinuxTest, self).setUp()
> > >           self.vm.add_args('-smp', '2')
> > >           self.vm.add_args('-m', '1024')
> > > +        self.vm.add_args('-netdev', 
> > > 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
> > > +                         '-device', '%s,netdev=vnet' % 
> > > network_device_type)
> > >           self.set_up_boot()
> > >           if ssh_pubkey is None:
> > >               ssh_pubkey, self.ssh_key = self.set_up_existing_ssh_keys()
> > > diff --git a/tests/acceptance/virtiofs_submounts.py 
> > > b/tests/acceptance/virtiofs_submounts.py
> > > index bed8ce44df..e10a935ac4 100644
> > > --- a/tests/acceptance/virtiofs_submounts.py
> > > +++ b/tests/acceptance/virtiofs_submounts.py
> > > @@ -207,10 +207,6 @@ def setUp(self):
> > >               self.vm.add_args('-kernel', vmlinuz,
> > >                                '-append', 'console=ttyS0 root=/dev/sda1')
> > > -        # Allow us to connect to SSH
> 
> Somewhat related with Eric's suggestion: keep the above comment along with
> the netdev setup code.
> 
> - Wainer
>

Sure, good point.

Thanks,
- Cleber.

signature.asc
Description: PGP signature