[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/12] tests/acceptance/boot_linux: Accept SSH pubkey
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 11/12] tests/acceptance/boot_linux: Accept SSH pubkey |
Date: |
Mon, 2 Nov 2020 19:56:56 +0000 |
From: Max Reitz <mreitz@redhat.com>
Let download_cloudinit() take an optional pubkey, which subclasses of
BootLinux can pass through setUp().
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201102161859.156603-7-mreitz@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
tests/acceptance/boot_linux.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py
index c743e231f4..1da4a53d6a 100644
--- a/tests/acceptance/boot_linux.py
+++ b/tests/acceptance/boot_linux.py
@@ -57,7 +57,7 @@ class BootLinuxBase(Test):
self.cancel('Failed to download/prepare boot image')
return boot.path
- def download_cloudinit(self):
+ def download_cloudinit(self, ssh_pubkey=None):
self.log.info('Preparing cloudinit image')
try:
cloudinit_iso = os.path.join(self.workdir, 'cloudinit.iso')
@@ -67,7 +67,8 @@ class BootLinuxBase(Test):
password='password',
# QEMU's hard coded usermode router address
phone_home_host='10.0.2.2',
- phone_home_port=self.phone_home_port)
+ phone_home_port=self.phone_home_port,
+ authorized_key=ssh_pubkey)
except Exception:
self.cancel('Failed to prepared cloudinit image')
return cloudinit_iso
@@ -80,19 +81,19 @@ class BootLinux(BootLinuxBase):
timeout = 900
chksum = None
- def setUp(self):
+ def setUp(self, ssh_pubkey=None):
super(BootLinux, self).setUp()
self.vm.add_args('-smp', '2')
self.vm.add_args('-m', '1024')
self.prepare_boot()
- self.prepare_cloudinit()
+ self.prepare_cloudinit(ssh_pubkey)
def prepare_boot(self):
path = self.download_boot()
self.vm.add_args('-drive', 'file=%s' % path)
- def prepare_cloudinit(self):
- cloudinit_iso = self.download_cloudinit()
+ def prepare_cloudinit(self, ssh_pubkey=None):
+ cloudinit_iso = self.download_cloudinit(ssh_pubkey)
self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso)
def launch_and_wait(self):
--
2.28.0
- [PULL 01/12] migration: Unify reset of last_rb on destination node when recover, (continued)
- [PULL 01/12] migration: Unify reset of last_rb on destination node when recover, Dr. David Alan Gilbert (git), 2020/11/02
- [PULL 05/12] virtiofsd: Fix the help message of posix lock, Dr. David Alan Gilbert (git), 2020/11/02
- [PULL 04/12] tools/virtiofsd: Check vu_init() return value (CID 1435958), Dr. David Alan Gilbert (git), 2020/11/02
- [PULL 06/12] virtiofsd: Check FUSE_SUBMOUNTS, Dr. David Alan Gilbert (git), 2020/11/02
- [PULL 07/12] virtiofsd: Add attr_flags to fuse_entry_param, Dr. David Alan Gilbert (git), 2020/11/02
- [PULL 08/12] meson.build: Check for statx(), Dr. David Alan Gilbert (git), 2020/11/02
- [PULL 09/12] virtiofsd: Add mount ID to the lo_inode key, Dr. David Alan Gilbert (git), 2020/11/02
- [PULL 10/12] virtiofsd: Announce sub-mount points, Dr. David Alan Gilbert (git), 2020/11/02
- [PULL 11/12] tests/acceptance/boot_linux: Accept SSH pubkey,
Dr. David Alan Gilbert (git) <=
- [PULL 12/12] tests/acceptance: Add virtiofs_submounts.py, Dr. David Alan Gilbert (git), 2020/11/02
- Re: [PULL 00/12] migration queue, Peter Maydell, 2020/11/03