[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/8] tests/acceptance/boot_linux: Accept SSH pubkey
From: |
Max Reitz |
Subject: |
[PATCH 7/8] tests/acceptance/boot_linux: Accept SSH pubkey |
Date: |
Wed, 9 Sep 2020 20:40:27 +0200 |
Let download_cloudinit() take an optional pubkey, which subclasses of
BootLinux can pass through setUp().
Signed-off-by: Max Reitz <mreitz@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 0055dc7cee..ad997c3f2e 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.26.2
- [PATCH 0/8] virtiofsd: Announce submounts to the guest, Max Reitz, 2020/09/09
- [PATCH 1/8] linux/fuse.h: Pull in from Linux, Max Reitz, 2020/09/09
- [PATCH 2/8] virtiofsd: Announce FUSE_ATTR_FLAGS, Max Reitz, 2020/09/09
- [PATCH 3/8] virtiofsd: Add attr_flags to fuse_entry_param, Max Reitz, 2020/09/09
- [PATCH 4/8] virtiofsd: Add fuse_reply_attr_with_flags(), Max Reitz, 2020/09/09
- [PATCH 5/8] virtiofsd: Store every lo_inode's parent_dev, Max Reitz, 2020/09/09
- [PATCH 7/8] tests/acceptance/boot_linux: Accept SSH pubkey,
Max Reitz <=
- [PATCH 6/8] virtiofsd: Announce sub-mount points, Max Reitz, 2020/09/09
- [PATCH 8/8] tests/acceptance: Add virtiofs_submounts.py, Max Reitz, 2020/09/09
- Re: [PATCH 0/8] virtiofsd: Announce submounts to the guest, Stefan Hajnoczi, 2020/09/11