Added s390_hkd_revocation_list attribute

Optional attribute in the chain of hkd attributes

Author: schaefi

kiwi/schema/kiwi.rnc

@@ -2911,6 +2911,14 @@ div {
             sch:param [ name = "attr" value = "s390_hkd_sign_cert" ]
             sch:param [ name = "types" value = "zipl grub2_s390x_emu" ]
         ]
+    k.bootloader.s390_hkd_revocation_list.attribute =
+        ## Specifies the s390 confidental compute host key document (hkd)
+        ## revocation list (CRL) file.
+        attribute s390_hkd_revocation_list { text }
+        >> sch:pattern [ id = "s390_hkd_revocation_list" is-a = "bootloader_name_type"
+            sch:param [ name = "attr" value = "s390_hkd_revocation_list" ]
+            sch:param [ name = "types" value = "zipl grub2_s390x_emu" ]
+        ]
     k.bootloader.console.attribute =
         ## Specifies the bootloader console.
         attribute console { grub_console }
@@ -2972,7 +2980,8 @@ div {
         k.bootloader.s390_hkd_cert.attribute? &
         (
             k.bootloader.s390_hkd_ca_cert.attribute &
-            k.bootloader.s390_hkd_sign_cert.attribute
+            k.bootloader.s390_hkd_sign_cert.attribute &
+            k.bootloader.s390_hkd_revocation_list.attribute?
         )? &
         k.bootloader.console.attribute? &
         k.bootloader.serial_line.attribute? &

kiwi/schema/kiwi.rng

@@ -4381,6 +4381,16 @@ signing key certificate file.</a:documentation>
         <sch:param name="types" value="zipl grub2_s390x_emu"/>
       </sch:pattern>
     </define>
+    <define name="k.bootloader.s390_hkd_revocation_list.attribute">
+      <attribute name="s390_hkd_revocation_list">
+        <a:documentation>Specifies the s390 confidental compute host key document (hkd)
+revocation list (CRL) file.</a:documentation>
+      </attribute>
+      <sch:pattern id="s390_hkd_revocation_list" is-a="bootloader_name_type">
+        <sch:param name="attr" value="s390_hkd_revocation_list"/>
+        <sch:param name="types" value="zipl grub2_s390x_emu"/>
+      </sch:pattern>
+    </define>
     <define name="k.bootloader.console.attribute">
       <attribute name="console">
         <a:documentation>Specifies the bootloader console.</a:documentation>
@@ -4470,6 +4480,9 @@ is useful for full disk encryption images</a:documentation>
           <interleave>
             <ref name="k.bootloader.s390_hkd_ca_cert.attribute"/>
             <ref name="k.bootloader.s390_hkd_sign_cert.attribute"/>
+            <optional>
+              <ref name="k.bootloader.s390_hkd_revocation_list.attribute"/>
+            </optional>
           </interleave>
         </optional>
         <optional>

kiwi/xml_parse.py

@@ -16,7 +16,7 @@
 #   kiwi/schema/kiwi_for_generateDS.xsd
 #
 # Command line:
-#   /home/ms/Project/kiwi/.tox/unit_py3_11/bin/generateDS.py -f --external-encoding="utf-8" --no-dates --no-warnings -o "kiwi/xml_parse.py" kiwi/schema/kiwi_for_generateDS.xsd
+#   /home/ms/.cache/pypoetry/virtualenvs/kiwi-Btua-i95-py3.11/bin/generateDS.py -f --external-encoding="utf-8" --no-dates --no-warnings -o "kiwi/xml_parse.py" kiwi/schema/kiwi_for_generateDS.xsd
 #
 # Current working directory (os.getcwd()):
 #   kiwi
@@ -5967,13 +5967,14 @@ class bootloader(GeneratedsSuper):
     provide configuration parameters for it"""
     subclass = None
     superclass = None
-    def __init__(self, name=None, bls=None, s390_hkd_cert=None, s390_hkd_ca_cert=None, s390_hkd_sign_cert=None, console=None, serial_line=None, timeout=None, timeout_style=None, targettype=None, use_disk_password=None, grub_template=None, bootloadersettings=None):
+    def __init__(self, name=None, bls=None, s390_hkd_cert=None, s390_hkd_ca_cert=None, s390_hkd_sign_cert=None, s390_hkd_revocation_list=None, console=None, serial_line=None, timeout=None, timeout_style=None, targettype=None, use_disk_password=None, grub_template=None, bootloadersettings=None):
         self.original_tagname_ = None
         self.name = _cast(None, name)
         self.bls = _cast(bool, bls)
         self.s390_hkd_cert = _cast(None, s390_hkd_cert)
         self.s390_hkd_ca_cert = _cast(None, s390_hkd_ca_cert)
         self.s390_hkd_sign_cert = _cast(None, s390_hkd_sign_cert)
+        self.s390_hkd_revocation_list = _cast(None, s390_hkd_revocation_list)
         self.console = _cast(None, console)
         self.serial_line = _cast(None, serial_line)
         self.timeout = _cast(int, timeout)
@@ -6005,6 +6006,8 @@ def get_s390_hkd_ca_cert(self): return self.s390_hkd_ca_cert
     def set_s390_hkd_ca_cert(self, s390_hkd_ca_cert): self.s390_hkd_ca_cert = s390_hkd_ca_cert
     def get_s390_hkd_sign_cert(self): return self.s390_hkd_sign_cert
     def set_s390_hkd_sign_cert(self, s390_hkd_sign_cert): self.s390_hkd_sign_cert = s390_hkd_sign_cert
+    def get_s390_hkd_revocation_list(self): return self.s390_hkd_revocation_list
+    def set_s390_hkd_revocation_list(self, s390_hkd_revocation_list): self.s390_hkd_revocation_list = s390_hkd_revocation_list
     def get_console(self): return self.console
     def set_console(self, console): self.console = console
     def get_serial_line(self): return self.serial_line
@@ -6070,6 +6073,9 @@ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='
         if self.s390_hkd_sign_cert is not None and 's390_hkd_sign_cert' not in already_processed:
             already_processed.add('s390_hkd_sign_cert')
             outfile.write(' s390_hkd_sign_cert=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.s390_hkd_sign_cert), input_name='s390_hkd_sign_cert')), ))
+        if self.s390_hkd_revocation_list is not None and 's390_hkd_revocation_list' not in already_processed:
+            already_processed.add('s390_hkd_revocation_list')
+            outfile.write(' s390_hkd_revocation_list=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.s390_hkd_revocation_list), input_name='s390_hkd_revocation_list')), ))
         if self.console is not None and 'console' not in already_processed:
             already_processed.add('console')
             outfile.write(' console=%s' % (quote_attrib(self.console), ))
@@ -6132,6 +6138,10 @@ def buildAttributes(self, node, attrs, already_processed):
         if value is not None and 's390_hkd_sign_cert' not in already_processed:
             already_processed.add('s390_hkd_sign_cert')
             self.s390_hkd_sign_cert = value
+        value = find_attr_value_('s390_hkd_revocation_list', node)
+        if value is not None and 's390_hkd_revocation_list' not in already_processed:
+            already_processed.add('s390_hkd_revocation_list')
+            self.s390_hkd_revocation_list = value
         value = find_attr_value_('console', node)
         if value is not None and 'console' not in already_processed:
             already_processed.add('console')