[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/11] Acceptance Tests: set up SSH connection by default afte
From: |
Cleber Rosa |
Subject: |
[PATCH v3 07/11] Acceptance Tests: set up SSH connection by default after boot for LinuxTest |
Date: |
Mon, 12 Apr 2021 00:46:40 -0400 |
The LinuxTest specifically targets users that need to interact with Linux
guests. So, it makes sense to give a connection by default, and avoid
requiring it as boiler-plate code.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 5 ++++-
tests/acceptance/boot_linux.py | 18 +++++++++---------
tests/acceptance/virtiofs_submounts.py | 1 -
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py
b/tests/acceptance/avocado_qemu/__init__.py
index 25f871f5bc6..1062a851b97 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -391,7 +391,7 @@ def set_up_cloudinit(self, ssh_pubkey=None):
cloudinit_iso = self.prepare_cloudinit(ssh_pubkey)
self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso)
- def launch_and_wait(self):
+ def launch_and_wait(self, set_up_ssh_connection=True):
self.vm.set_console()
self.vm.launch()
console_drainer =
datadrainer.LineLogger(self.vm.console_socket.fileno(),
@@ -399,3 +399,6 @@ def launch_and_wait(self):
console_drainer.start()
self.log.info('VM launched, waiting for boot confirmation from guest')
cloudinit.wait_for_phone_home(('0.0.0.0', self.phone_home_port),
self.name)
+ if set_up_ssh_connection:
+ self.log.info('Setting up the SSH connection')
+ self.ssh_connect(self.username, self.ssh_key)
diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py
index 0d178038a09..314370fd1f5 100644
--- a/tests/acceptance/boot_linux.py
+++ b/tests/acceptance/boot_linux.py
@@ -29,7 +29,7 @@ def test_pc_i440fx_tcg(self):
"""
self.require_accelerator("tcg")
self.vm.add_args("-accel", "tcg")
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
def test_pc_i440fx_kvm(self):
"""
@@ -38,7 +38,7 @@ def test_pc_i440fx_kvm(self):
"""
self.require_accelerator("kvm")
self.vm.add_args("-accel", "kvm")
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
def test_pc_q35_tcg(self):
"""
@@ -47,7 +47,7 @@ def test_pc_q35_tcg(self):
"""
self.require_accelerator("tcg")
self.vm.add_args("-accel", "tcg")
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
def test_pc_q35_kvm(self):
"""
@@ -56,7 +56,7 @@ def test_pc_q35_kvm(self):
"""
self.require_accelerator("kvm")
self.vm.add_args("-accel", "kvm")
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
class BootLinuxAarch64(LinuxTest):
@@ -85,7 +85,7 @@ def test_virt_tcg(self):
self.vm.add_args("-cpu", "max")
self.vm.add_args("-machine", "virt,gic-version=2")
self.add_common_args()
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
def test_virt_kvm_gicv2(self):
"""
@@ -98,7 +98,7 @@ def test_virt_kvm_gicv2(self):
self.vm.add_args("-cpu", "host")
self.vm.add_args("-machine", "virt,gic-version=2")
self.add_common_args()
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
def test_virt_kvm_gicv3(self):
"""
@@ -111,7 +111,7 @@ def test_virt_kvm_gicv3(self):
self.vm.add_args("-cpu", "host")
self.vm.add_args("-machine", "virt,gic-version=3")
self.add_common_args()
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
class BootLinuxPPC64(LinuxTest):
@@ -128,7 +128,7 @@ def test_pseries_tcg(self):
"""
self.require_accelerator("tcg")
self.vm.add_args("-accel", "tcg")
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
class BootLinuxS390X(LinuxTest):
@@ -146,4 +146,4 @@ def test_s390_ccw_virtio_tcg(self):
"""
self.require_accelerator("tcg")
self.vm.add_args("-accel", "tcg")
- self.launch_and_wait()
+ self.launch_and_wait(set_up_ssh_connection=False)
diff --git a/tests/acceptance/virtiofs_submounts.py
b/tests/acceptance/virtiofs_submounts.py
index e10a935ac4e..e019d3b896b 100644
--- a/tests/acceptance/virtiofs_submounts.py
+++ b/tests/acceptance/virtiofs_submounts.py
@@ -136,7 +136,6 @@ def set_up_virtiofs(self):
def launch_vm(self):
self.launch_and_wait()
- self.ssh_connect('root', self.ssh_key)
def set_up_nested_mounts(self):
scratch_dir = os.path.join(self.shared_dir, 'scratch')
--
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, 2021/04/12
- [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 <=
- [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