[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/11] Acceptance Tests: add port redirection for ssh by defau
From: |
Cleber Rosa |
Subject: |
[PATCH v3 05/11] Acceptance Tests: add port redirection for ssh by default |
Date: |
Mon, 12 Apr 2021 00:46:38 -0400 |
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
arguments.
It also sets the network device, by default, to virtio-net.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 5 ++++-
tests/acceptance/virtiofs_submounts.py | 4 ----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py
b/tests/acceptance/avocado_qemu/__init__.py
index 67f75f66e56..0856880000f 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -309,10 +309,13 @@ 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')
+ # The following network device allows for SSH connections
+ 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 bed8ce44dfc..e10a935ac4e 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
- self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
- '-device', 'virtio-net,netdev=vnet')
-
self.require_accelerator("kvm")
self.vm.add_args('-accel', 'kvm')
--
2.30.2
- [PATCH v3 00/11] Acceptance Test: introduce base class for Linux based tests, Cleber Rosa, 2021/04/12
- [PATCH v3 01/11] tests/acceptance/virtiofs_submounts.py: add missing accel tag, Cleber Rosa, 2021/04/12
- [PATCH v3 02/11] tests/acceptance/virtiofs_submounts.py: evaluate string not length, Cleber Rosa, 2021/04/12
- [PATCH v3 03/11] Python: add utility function for retrieving port redirection, Cleber Rosa, 2021/04/12
- [PATCH v3 04/11] Acceptance Tests: move useful ssh methods to base class, Cleber Rosa, 2021/04/12
- [PATCH v3 05/11] Acceptance Tests: add port redirection for ssh by default,
Cleber Rosa <=
- [PATCH v3 06/11] Acceptance Tests: make username/password configurable, Cleber Rosa, 2021/04/12
- [PATCH v3 07/11] Acceptance Tests: set up SSH connection by default after boot for LinuxTest, Cleber Rosa, 2021/04/12
- [PATCH v3 08/11] tests/acceptance/virtiofs_submounts.py: remove launch_vm(), Cleber Rosa, 2021/04/12
- [PATCH v3 09/11] Acceptance Tests: add basic documentation on LinuxTest base class, Cleber Rosa, 2021/04/12
- [PATCH v3 10/11] Acceptance Tests: introduce CPU hotplug test, Cleber Rosa, 2021/04/12
- [PATCH v3 11/11] tests/acceptance/virtiofs_submounts.py: fix setup of SSH pubkey, Cleber Rosa, 2021/04/12