fix: 'dict object' has no attribute 'iteritems'

Signed-off-by: Martin Styk <mart.styk@gmail.com>

Author: StykMartin

LabController/src/bkr/labcontroller/pxemenu-templates/efi-grub-menu

@@ -1,5 +1,5 @@
-{% for osmajor, osversions in osmajors.iteritems()|sort(reverse=True) %}
-{% for osversion, distro_trees in osversions.iteritems()|sort(reverse=True) %}
+{% for osmajor, osversions in osmajors.items()|sort(reverse=True) %}
+{% for osversion, distro_trees in osversions.items()|sort(reverse=True) %}
 {% for distro_tree in distro_trees %}
 
 title {{ distro_tree.distro_name }} {{ distro_tree.variant }} {{ distro_tree.arch }}

LabController/src/bkr/labcontroller/pxemenu-templates/grub2-menu

@@ -4,10 +4,10 @@ menuentry "Exit PXE" {
     exit
 }
 
-{% for osmajor, osversions in osmajors.iteritems()|sort(reverse=True) %}
+{% for osmajor, osversions in osmajors.items()|sort(reverse=True) %}
 submenu "{{ osmajor }}" {
 
-{% for osversion, distro_trees in osversions.iteritems()|sort(reverse=True) %}
+{% for osversion, distro_trees in osversions.items()|sort(reverse=True) %}
 submenu "{{ osversion }}" {
 
 {% for distro_tree in distro_trees %}

LabController/src/bkr/labcontroller/pxemenu-templates/ipxe-menu

@@ -5,7 +5,7 @@ chain /ipxe/${ip:hexraw} ||
 :main_menu
 menu Beaker
 item local (local)
-{% for osmajor, osversions in osmajors.iteritems()|sort(reverse=True) %}
+{% for osmajor, osversions in osmajors.items()|sort(reverse=True) %}
 item {{ osmajor }} {{ osmajor }} ->
 {% endfor %}
 choose --default local --timeout 600000 target && goto ${target} || goto local
@@ -16,16 +16,16 @@ iseq ${builtin/platform} pcbios && sanboot --no-describe --drive 0x80 ||
 # exit 1 generates an error message but req'd for some systems to fall through
 exit 1 || goto main_menu
 
-{% for osmajor, osversions in osmajors.iteritems()|sort(reverse=True) %}
+{% for osmajor, osversions in osmajors.items()|sort(reverse=True) %}
 :{{ osmajor }}
 menu {{ osmajor }}
-{% for osversion, distro_trees in osversions.iteritems()|sort(reverse=True) %}
+{% for osversion, distro_trees in osversions.items()|sort(reverse=True) %}
 item {{ osversion }} {{ osversion }} ->
 {% endfor %}
 item main_menu back <-
 choose target && goto ${target} || goto main_menu
 
-{% for osversion, distro_trees in osversions.iteritems()|sort(reverse=True) %}
+{% for osversion, distro_trees in osversions.items()|sort(reverse=True) %}
 :{{ osversion }}
 menu {{ osversion }}
 {% for distro_tree in distro_trees %}

LabController/src/bkr/labcontroller/pxemenu-templates/pxelinux-menu

@@ -8,11 +8,11 @@ label local
     menu default
     localboot 0
 
-{% for osmajor, osversions in osmajors.iteritems()|sort(reverse=True) %}
+{% for osmajor, osversions in osmajors.items()|sort(reverse=True) %}
 menu begin
 menu title {{ osmajor }}
 
-{% for osversion, distro_trees in osversions.iteritems()|sort(reverse=True) %}
+{% for osversion, distro_trees in osversions.items()|sort(reverse=True) %}
 menu begin
 menu title {{ osversion }}
 

LabController/src/bkr/labcontroller/test_pxemenu.py

@@ -0,0 +1,86 @@
+# Copyright Contributors to the Beaker project.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import unittest
+
+from bkr.labcontroller.pxemenu import template_env
+
+
+def _mock_osmajors():
+    return {
+        "RedHatEnterpriseLinux9": {
+            "RedHatEnterpriseLinux9.2": [
+                {
+                    "distro_tree_id": 100,
+                    "distro_osmajor": "RedHatEnterpriseLinux9",
+                    "distro_osversion": "RedHatEnterpriseLinux9.2",
+                    "distro_name": "RHEL-9.2.0-20230401.0",
+                    "variant": "BaseOS",
+                    "arch": "x86_64",
+                    "kernel_options": "",
+                    "available": [("lab1", "http://example.com/rhel9/")],
+                    "images": [
+                        ("kernel", "pxeboot/vmlinuz"),
+                        ("initrd", "pxeboot/initrd.img"),
+                    ],
+                },
+            ],
+        },
+        "Fedora42": {
+            "Fedora42": [
+                {
+                    "distro_tree_id": 200,
+                    "distro_osmajor": "Fedora42",
+                    "distro_osversion": "Fedora42",
+                    "distro_name": "Fedora-38-20230401.0",
+                    "variant": "Everything",
+                    "arch": "x86_64",
+                    "kernel_options": "",
+                    "available": [("lab1", "http://example.com/fedora42/")],
+                    "images": [
+                        ("kernel", "pxeboot/vmlinuz"),
+                        ("initrd", "pxeboot/initrd.img"),
+                    ],
+                },
+            ],
+        },
+    }
+
+
+class TestPxemenuTemplates(unittest.TestCase):
+    def _render(self, template_name, osmajors=None):
+        if osmajors is None:
+            osmajors = _mock_osmajors()
+        template = template_env.get_template(template_name)
+        return template.render({"osmajors": osmajors})
+
+    def test_pxelinux_menu(self):
+        output = self._render("pxelinux-menu")
+        self.assertIn("RHEL-9.2.0-20230401.0", output)
+        self.assertIn("Fedora-38-20230401.0", output)
+        self.assertIn("/distrotrees/100/kernel", output)
+        self.assertIn("/distrotrees/200/kernel", output)
+        self.assertIn("menu title Beaker", output)
+
+    def test_efi_grub_menu(self):
+        output = self._render("efi-grub-menu")
+        self.assertIn("RHEL-9.2.0-20230401.0", output)
+        self.assertIn("Fedora-38-20230401.0", output)
+        self.assertIn("/distrotrees/100/kernel", output)
+        self.assertIn("root (nd)", output)
+
+    def test_grub2_menu(self):
+        output = self._render("grub2-menu")
+        self.assertIn("RHEL-9.2.0-20230401.0", output)
+        self.assertIn("Fedora-38-20230401.0", output)
+        self.assertIn("menuentry", output)
+        self.assertIn("/distrotrees/100/kernel", output)
+        self.assertIn("submenu", output)
+
+    def test_ipxe_menu(self):
+        output = self._render("ipxe-menu")
+        self.assertIn("#!ipxe", output)
+        self.assertIn("RHEL-9.2.0-20230401.0", output)
+        self.assertIn("Fedora-38-20230401.0", output)
+        self.assertIn("/distrotrees/100/kernel", output)
+        self.assertIn("/distrotrees/200/kernel", output)