powervs: make disk name in OVA more descriptive

Signed-off-by: Poorna Gottimukkula <[email protected]>

This will give more meaning full name for disk raw image volume from powervc image volumes view,
for example "rhcos-416-94-202401181356-0-disk-raw for rhcos".

Signed-off-by: Poorna Gottimukkula <[email protected]>

Author: Poorna-Gottimukkula1

src/cosalib/ibmcloud.py

@@ -38,9 +38,7 @@
         "image_suffix": "ova.gz",
         "platform": "powervs",
         "compression": "gzip",
-        "tar_members": [
-            "disk.raw"
-        ]
+        "tar_members": []  # disk image is added as part of write_ova() function.
     },
 }
 
@@ -99,6 +97,7 @@ def write_ova(self, image_name):
         log.debug(ovf_xml)
         # OVF descriptor must come first, then the manifest, then the meta file
         self.tar_members.append(self.ovf_path)
+        self.tar_members.append(f'{ovf_params["image"]}-disk.raw')
 
 
 @retry(reraise=True, stop=stop_after_attempt(3))

src/powervs-template.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ovf:Envelope xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <ovf:References>
-    <ovf:File href="disk.raw" id="file1" size="{image_size}"/>
+    <ovf:File href="{image}-disk.raw" id="file1" size="{image_size}"/>
   </ovf:References>
   <ovf:DiskSection>
     <ovf:Info>Disk Section</ovf:Info>
@@ -24,7 +24,7 @@
         <ovf:Info>Storage resources</ovf:Info>
         <ovf:Item>
           <rasd:Description>Temporary clone for export</rasd:Description>
-          <rasd:ElementName>disk.raw</rasd:ElementName>
+          <rasd:ElementName>{image}-disk.raw</rasd:ElementName>
           <rasd:HostResource>ovf:/disk/disk1</rasd:HostResource>
           <rasd:InstanceID>1</rasd:InstanceID>
           <rasd:ResourceType>17</rasd:ResourceType>