From a9c07400e8ac1bca21f6d55c311b2e64f12c27eb Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>

Date: Mon, 23 May 2016 15:31:46 +0200

Subject: [PATCH] v2v: handle subfolders in ova files

Some ova files like those produced by SUSE Studio have their ovf, mf

and other files inside a folder rather than at the root of the

tarball. Consider the paths relative to the ovf and mf files to cover

this case too.

(cherry picked from commit 9de9300e8b7a99fa06e290f20ef1aaa1eb6f7431)

---

 v2v/Makefile.am                        |   1 +

 v2v/input_ova.ml                       |   6 +-

 v2v/test-v2v-i-ova-subfolders.expected |  17 ++++

 v2v/test-v2v-i-ova-subfolders.ovf      | 138 +++++++++++++++++++++++++++++++++

 v2v/test-v2v-i-ova-subfolders.sh       |  65 ++++++++++++++++

 5 files changed, 225 insertions(+), 2 deletions(-)

 create mode 100644 v2v/test-v2v-i-ova-subfolders.expected

 create mode 100644 v2v/test-v2v-i-ova-subfolders.ovf

 create mode 100755 v2v/test-v2v-i-ova-subfolders.sh

diff --git a/v2v/Makefile.am b/v2v/Makefile.am

index 2d52ab8..8354560 100644

--- a/v2v/Makefile.am

+++ b/v2v/Makefile.am

@@ -285,6 +285,7 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test

 TESTS = \

 	test-v2v-i-ova-formats.sh \

 	test-v2v-i-ova-gz.sh \

+	test-v2v-i-ova-subfolders.sh \

 	test-v2v-i-ova-two-disks.sh \

 	test-v2v-copy-to-local.sh \

 	test-v2v-bad-networks-and-bridges.sh

diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml

index 28dafe6..0a4dfd5 100644

--- a/v2v/input_ova.ml

+++ b/v2v/input_ova.ml

@@ -134,13 +134,14 @@ object

     let rex = Str.regexp "SHA1(\\(.*\\))=\\([0-9a-fA-F]+\\)\r?" in

     List.iter (

       fun mf ->

+        let mf_folder = Filename.dirname mf in

         let chan = open_in mf in

         let rec loop () =

           let line = input_line chan in

           if Str.string_match rex line 0 then (

             let disk = Str.matched_group 1 line in

             let expected = Str.matched_group 2 line in

-            let cmd = sprintf "sha1sum %s" (quote (exploded // disk)) in

+            let cmd = sprintf "sha1sum %s" (quote (mf_folder // disk)) in

             let out = external_command cmd in

             match out with

             | [] ->

@@ -159,6 +160,7 @@ object

     ) mf;

     (* Parse the ovf file. *)

+    let ovf_folder = Filename.dirname ovf in

     let xml = read_whole_file ovf in

     let doc = Xml.parse_memory xml in

@@ -259,7 +261,7 @@ object

             | Some s -> s in

           (* Does the file exist and is it readable? *)

-          let filename = exploded // filename in

+          let filename = ovf_folder // filename in

           Unix.access filename [Unix.R_OK];

           (* The spec allows the file to be gzip-compressed, in which case

diff --git a/v2v/test-v2v-i-ova-subfolders.expected b/v2v/test-v2v-i-ova-subfolders.expected

new file mode 100644

index 0000000..7037b9e

--- /dev/null

+++ b/v2v/test-v2v-i-ova-subfolders.expected

@@ -0,0 +1,17 @@

+Source guest information (--print-source option):

+

+    source name: 2K8R2EESP1_2_Medium

+hypervisor type: vmware

+         memory: 1073741824 (bytes)

+       nr vCPUs: 1

+   CPU features: 

+       firmware: uefi

+        display: 

+          sound: 

+disks:

+	subfolder/disk1.vmdk (vmdk) [scsi]

+removable media:

+	CD-ROM [ide] in slot 0

+NICs:

+	Network "Network adapter 1"

+

diff --git a/v2v/test-v2v-i-ova-subfolders.ovf b/v2v/test-v2v-i-ova-subfolders.ovf

new file mode 100644

index 0000000..4827c7e

--- /dev/null

+++ b/v2v/test-v2v-i-ova-subfolders.ovf

@@ -0,0 +1,138 @@

+

+<Envelope vmw:buildId="build-1750787" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+  <References>

+    <File ovf:href="disk1.vmdk" ovf:id="file1" ovf:size="7804077568"/>

+  </References>

+  <DiskSection>

+    <Info>Virtual disk information</Info>

+    <Disk ovf:capacity="50" ovf:capacityAllocationUnits="byte * 2^30" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="18975752192"/>

+  </DiskSection>

+  <NetworkSection>

+    <Info>The list of logical networks</Info>

+    <Network ovf:name="PG-VLAN60">

+      <Description>The PG-VLAN60 network</Description>

+    </Network>

+  </NetworkSection>

+  <VirtualSystem ovf:id="2K8R2EESP1_2_Medium">

+    <Info>A virtual machine</Info>

+    <Name>2K8R2EESP1_2_Medium</Name>

+    <OperatingSystemSection ovf:id="103" vmw:osType="windows7Server64Guest">

+      <Info>The kind of installed guest operating system</Info>

+      <Description>Microsoft Windows Server 2008 R2 (64-bit)</Description>

+    </OperatingSystemSection>

+    <VirtualHardwareSection>

+      <Info>Virtual hardware requirements</Info>

+      <System>

+        <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>

+        <vssd:InstanceID>0</vssd:InstanceID>

+        <vssd:VirtualSystemIdentifier>2K8R2EESP1_2_Medium</vssd:VirtualSystemIdentifier>

+        <vssd:VirtualSystemType>vmx-10</vssd:VirtualSystemType>

+      </System>

+      <Item>

+        <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>

+        <rasd:Description>Number of Virtual CPUs</rasd:Description>

+        <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>

+        <rasd:InstanceID>1</rasd:InstanceID>

+        <rasd:ResourceType>3</rasd:ResourceType>

+        <rasd:VirtualQuantity>1</rasd:VirtualQuantity>

+      </Item>

+      <Item>

+        <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>

+        <rasd:Description>Memory Size</rasd:Description>

+        <rasd:ElementName>1024MB of memory</rasd:ElementName>

+        <rasd:InstanceID>2</rasd:InstanceID>

+        <rasd:ResourceType>4</rasd:ResourceType>

+        <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>

+      </Item>

+      <Item>

+        <rasd:Address>0</rasd:Address>

+        <rasd:Description>SCSI Controller</rasd:Description>

+        <rasd:ElementName>SCSI controller 0</rasd:ElementName>

+        <rasd:InstanceID>3</rasd:InstanceID>

+        <rasd:ResourceSubType>lsilogicsas</rasd:ResourceSubType>

+        <rasd:ResourceType>6</rasd:ResourceType>

+        <vmw:Config ovf:required="false" vmw:key="slotInfo.pciSlotNumber" vmw:value="160"/>

+      </Item>

+      <Item>

+        <rasd:Address>1</rasd:Address>

+        <rasd:Description>IDE Controller</rasd:Description>

+        <rasd:ElementName>IDE 1</rasd:ElementName>

+        <rasd:InstanceID>4</rasd:InstanceID>

+        <rasd:ResourceType>5</rasd:ResourceType>

+      </Item>

+      <Item>

+        <rasd:Address>0</rasd:Address>

+        <rasd:Description>IDE Controller</rasd:Description>

+        <rasd:ElementName>IDE 0</rasd:ElementName>

+        <rasd:InstanceID>5</rasd:InstanceID>

+        <rasd:ResourceType>5</rasd:ResourceType>

+      </Item>

+      <Item ovf:required="false">

+        <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>

+        <rasd:ElementName>Video card</rasd:ElementName>

+        <rasd:InstanceID>6</rasd:InstanceID>

+        <rasd:ResourceType>24</rasd:ResourceType>

+        <vmw:Config ovf:required="false" vmw:key="enable3DSupport" vmw:value="false"/>

+        <vmw:Config ovf:required="false" vmw:key="use3dRenderer" vmw:value="automatic"/>

+        <vmw:Config ovf:required="false" vmw:key="useAutoDetect" vmw:value="true"/>

+        <vmw:Config ovf:required="false" vmw:key="videoRamSizeInKB" vmw:value="4096"/>

+      </Item>

+      <Item ovf:required="false">

+        <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>

+        <rasd:ElementName>VMCI device</rasd:ElementName>

+        <rasd:InstanceID>7</rasd:InstanceID>

+        <rasd:ResourceSubType>vmware.vmci</rasd:ResourceSubType>

+        <rasd:ResourceType>1</rasd:ResourceType>

+        <vmw:Config ovf:required="false" vmw:key="allowUnrestrictedCommunication" vmw:value="false"/>

+        <vmw:Config ovf:required="false" vmw:key="slotInfo.pciSlotNumber" vmw:value="32"/>

+      </Item>

+      <Item ovf:required="false">

+        <rasd:AddressOnParent>0</rasd:AddressOnParent>

+        <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>

+        <rasd:ElementName>CD/DVD drive 1</rasd:ElementName>

+        <rasd:InstanceID>8</rasd:InstanceID>

+        <rasd:Parent>4</rasd:Parent>

+        <rasd:ResourceSubType>vmware.cdrom.atapi</rasd:ResourceSubType>

+        <rasd:ResourceType>15</rasd:ResourceType>

+      </Item>

+      <Item>

+        <rasd:AddressOnParent>0</rasd:AddressOnParent>

+        <rasd:ElementName>Hard disk 1</rasd:ElementName>

+        <rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>

+        <rasd:InstanceID>9</rasd:InstanceID>

+        <rasd:Parent>3</rasd:Parent>

+        <rasd:ResourceType>17</rasd:ResourceType>

+        <vmw:Config ovf:required="false" vmw:key="backing.writeThrough" vmw:value="false"/>

+      </Item>

+      <Item>

+        <rasd:AddressOnParent>7</rasd:AddressOnParent>

+        <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>

+        <rasd:Connection>PG-VLAN60</rasd:Connection>

+        <rasd:Description>E1000 ethernet adapter on "PG-VLAN60"</rasd:Description>

+        <rasd:ElementName>Network adapter 1</rasd:ElementName>

+        <rasd:InstanceID>11</rasd:InstanceID>

+        <rasd:ResourceSubType>E1000</rasd:ResourceSubType>

+        <rasd:ResourceType>10</rasd:ResourceType>

+        <vmw:Config ovf:required="false" vmw:key="slotInfo.pciSlotNumber" vmw:value="33"/>

+        <vmw:Config ovf:required="false" vmw:key="wakeOnLanEnabled" vmw:value="true"/>

+      </Item>

+      <vmw:Config ovf:required="false" vmw:key="cpuHotAddEnabled" vmw:value="false"/>

+      <vmw:Config ovf:required="false" vmw:key="cpuHotRemoveEnabled" vmw:value="false"/>

+      <vmw:Config ovf:required="false" vmw:key="firmware" vmw:value="efi"/>

+      <vmw:Config ovf:required="false" vmw:key="virtualICH7MPresent" vmw:value="false"/>

+      <vmw:Config ovf:required="false" vmw:key="virtualSMCPresent" vmw:value="false"/>

+      <vmw:Config ovf:required="false" vmw:key="memoryHotAddEnabled" vmw:value="false"/>

+      <vmw:Config ovf:required="false" vmw:key="nestedHVEnabled" vmw:value="false"/>

+      <vmw:Config ovf:required="false" vmw:key="powerOpInfo.powerOffType" vmw:value="soft"/>

+      <vmw:Config ovf:required="false" vmw:key="powerOpInfo.resetType" vmw:value="soft"/>

+      <vmw:Config ovf:required="false" vmw:key="powerOpInfo.standbyAction" vmw:value="checkpoint"/>

+      <vmw:Config ovf:required="false" vmw:key="powerOpInfo.suspendType" vmw:value="hard"/>

+      <vmw:Config ovf:required="false" vmw:key="tools.afterPowerOn" vmw:value="true"/>

+      <vmw:Config ovf:required="false" vmw:key="tools.afterResume" vmw:value="true"/>

+      <vmw:Config ovf:required="false" vmw:key="tools.beforeGuestShutdown" vmw:value="true"/>

+      <vmw:Config ovf:required="false" vmw:key="tools.beforeGuestStandby" vmw:value="true"/>

+      <vmw:Config ovf:required="false" vmw:key="tools.syncTimeWithHost" vmw:value="false"/>

+      <vmw:Config ovf:required="false" vmw:key="tools.toolsUpgradePolicy" vmw:value="upgradeAtPowerCycle"/>

+    </VirtualHardwareSection>

+  </VirtualSystem>

+</Envelope>                                 

diff --git a/v2v/test-v2v-i-ova-subfolders.sh b/v2v/test-v2v-i-ova-subfolders.sh

new file mode 100755

index 0000000..a590fcc

--- /dev/null

+++ b/v2v/test-v2v-i-ova-subfolders.sh

@@ -0,0 +1,65 @@

+#!/bin/bash -

+# libguestfs virt-v2v test script

+# Copyright (C) 2014 Red Hat Inc.

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+

+# Test -i ova option with files located in a subfolder.

+

+unset CDPATH

+export LANG=C

+set -e

+

+if [ -n "$SKIP_TEST_V2V_I_OVA_SUBFOLDERS_SH" ]; then

+    echo "$0: test skipped because environment variable is set"

+    exit 77

+fi

+

+if [ "$(guestfish get-backend)" = "uml" ]; then

+    echo "$0: test skipped because UML backend does not support network"

+    exit 77

+fi

+

+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"

+

+. $srcdir/../test-data/guestfs-hashsums.sh

+

+d=test-v2v-i-ova-subfolders.d

+rm -rf $d

+mkdir -p $d/subfolder

+

+cp test-v2v-i-ova-subfolders.ovf $d/subfolder/

+

+pushd $d/subfolder

+

+truncate -s 10k disk1.vmdk

+sha=`do_sha1 disk1.vmdk`

+echo -e "SHA1(disk1.vmdk)=$sha\r" > disk1.mf

+

+cd ..

+tar -cf test.ova subfolder

+popd

+

+# Run virt-v2v but only as far as the --print-source stage, and

+# normalize the output.

+$VG virt-v2v --debug-gc --quiet \

+    -i ova $d/test.ova \

+    --print-source |

+sed 's,[^ \t]*\(subfolder/disk.*\.vmdk\),\1,' > $d/source

+

+# Check the parsed source is what we expect.

+diff -u test-v2v-i-ova-subfolders.expected $d/source

+

+rm -rf $d

-- 

1.8.3.1