Re: [PATCH 6/6] tests/boot_linux_console: add PVH acceptance tests

[Liam Merwick]

On 30/01/2020 23:57, Philippe Mathieu-Daudé wrote:
> On 1/27/20 5:36 PM, Liam Merwick wrote:
> > Add tests to boot an uncompressed kernel using the x86/HVM direct boot 
> > ABI.
> > The vmlinux binary is obtained from a small RPM for Kata containers and
> > extracted using the new extract_from_rpm() method.
> >
> > Signed-off-by: Liam Merwick <address@hidden>
> > ---
> >   tests/acceptance/boot_linux_console.py | 49 
> > +++++++++++++++++++++++++++++-----
> >   1 file changed, 43 insertions(+), 6 deletions(-)
> >
> > diff --git a/tests/acceptance/boot_linux_console.py 
> > b/tests/acceptance/boot_linux_console.py
> > index 6af19ae3b14a..ab2200aa0e47 100644
> > --- a/tests/acceptance/boot_linux_console.py
> > +++ b/tests/acceptance/boot_linux_console.py
> > @@ -65,15 +65,26 @@ class BootLinuxConsole(Test):
> >           os.chdir(cwd)
> >           return self.workdir + '/' + path
> > -    def do_test_x86_64_machine(self):
> > +    def do_test_x86_64_machine(self, pvh=False):
> >           """
> >           :avocado: tags=arch:x86_64
> >           """
> > -        kernel_url = 
> > ('https://archives.fedoraproject.org/pub/archive/fedora'
> > -                      
> > '/linux/releases/29/Everything/x86_64/os/images/pxeboot'
> > -                      '/vmlinuz')
> > -        kernel_hash = '23bebd2680757891cf7adedb033532163a792495'
> > -        kernel_path = self.fetch_asset(kernel_url, 
> > asset_hash=kernel_hash)
> > +        if pvh:
> > +            rpm_url = ('https://yum.oracle.com/repo/OracleLinux/'
> > +                       'OL7/olcne/x86_64/getPackage/'
> > +                       
> > 'kernel-uek-container-4.14.35-1902.6.6.1.el7.x86_64.rpm')
> > +            rpm_hash = '4c781711a9d32dcb8e81da2b397cb98926744e23'
> > +            rpm_path = self.fetch_asset(rpm_url, asset_hash=rpm_hash)
> > +            kernel_path = self.extract_from_rpm(rpm_path,
> > +                                                
> > './usr/share/kata-containers/'
> > +                                    
> > 'vmlinux-4.14.35-1902.6.6.1.el7.container')
> > +        else:
> > +            kernel_url = 
> > ('https://archives.fedoraproject.org/pub/archive/'
> > +                          
> > 'fedora/linux/releases/29/Everything/x86_64/os/'
> > +                          'images/pxeboot/vmlinuz')
> > +            kernel_hash = '23bebd2680757891cf7adedb033532163a792495'
> > +            kernel_path = self.fetch_asset(kernel_url, 
> > asset_hash=kernel_hash)
> > +
>
> Can you try using a dictionaries instead? This way we can add more 
> images easily.
> See IMAGE_INFO in tests/acceptance/linux_ssh_mips_malta.py.

I can. I won't convert the users of extract_from_deb() but will try make 
it easily extendable.


--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -31,6 +31,29 @@ class BootLinuxConsole(Test):

     KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '

+    KERNEL_PATH_INFO = {
+        ('x86_64', 'bzImage'): {
+            'type': 'file',
+            'url': 'https://archives.fedoraproject.org/'
+                   'pub/archive/fedora/linux/releases/29/Everything/'
+                   'x86_64/os/images/pxeboot/vmlinuz',
+            'hash': '23bebd2680757891cf7adedb033532163a792495'
+        }
+    }
+
+    def get_kernel_path(self, key):
+        """
+        For the provided key, download (and extract, if necessary) the 
kernel
+        and return the path the the kernel binary.
+
+        :param key: index into KERNEL_PATH_INFO dict containing kernel 
location
+        :returns: path of the extracted file
+        """
+        dinfo = self.KERNEL_PATH_INFO[(self.arch, key)]
+
+        if dinfo['type'] is 'file':
+            return self.fetch_asset(dinfo['url'], asset_hash=dinfo['hash'])
+
     def wait_for_console_pattern(self, success_message):
         wait_for_console_pattern(self, success_message,
                                  failure_message='Kernel panic - not 
syncing')
@@ -72,11 +95,7 @@ class BootLinuxConsole(Test):
         Common routine to boot an x86_64 guest.
         Caller must specify tags=arch and tags=machine
         """
-        kernel_url = 
('https://archives.fedoraproject.org/pub/archive/fedora'
- 
'/linux/releases/29/Everything/x86_64/os/images/pxeboot'
-                      '/vmlinuz')
-        kernel_hash = '23bebd2680757891cf7adedb033532163a792495'
-        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+        kernel_path = self.get_kernel_path('bzImage')
         self.vm.set_console()
         kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 
'console=ttyS0'
         self.vm.add_args('-kernel', kernel_path,


Regards,
Liam