search for: dd_uuid

This is just a bit of preparatory refactoring ... Rich.

...--vdsm-vol-uuid %s") vdsm_params.vol_uuids)) vdsm_params.vm_uuid + vdsm_params.ovf_output (match vmtype with | None -> "" | Some `Server -> " --vmtype server" @@ -57,9 +59,6 @@ object val mutable dd_mp = "" val mutable dd_uuid = "" - (* Target metadata directory. *) - val mutable ovf_dir = "" - (* This is called early on in the conversion and lets us choose the * name of the target files that eventually get written by the main * code. @@ -98,13 +97,12 @@ object ) vdsm_params.image_...

...ength uuid = 36 -> > + let mp = String.concat "/" (List.rev rest) in > + mp, uuid > + | _ -> > + error (f_"vdsm: invalid -os parameter does not contain a valid UUID: %s") > + os in > + > dd_mp <- mp; > dd_uuid <- uuid; > if verbose then > diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod > index a48bf59..2eb0079 100644 > --- a/v2v/virt-v2v.pod > +++ b/v2v/virt-v2v.pod > @@ -456,8 +456,10 @@ See L</OUTPUT TO RHEV> below. > > Set the output method to I<vdsm>. &...

...nversion and lets us choose the * name of the target files that eventually get written by the main * code. @@ -98,13 +97,12 @@ object eprintf "VDSM: image directory: %s\n%!" image_dir; (* Note that VDSM has to create this directory too. *) - ovf_dir <- dd_mp // dd_uuid // "master" // "vms" // vdsm_params.vm_uuid; - if not (is_directory ovf_dir) then + if not (is_directory vdsm_params.ovf_output) then error (f_"OVF (metadata) directory (%s) does not exist or is not a directory") - ovf_dir; + vdsm_params.ovf_...

...--vdsm-vol-uuid %s") vdsm_params.vol_uuids)) vdsm_params.vm_uuid + vdsm_params.ovf_output (match vmtype with | None -> "" | Some `Server -> " --vmtype server" @@ -57,9 +59,6 @@ object val mutable dd_mp = "" val mutable dd_uuid = "" - (* Target metadata directory. *) - val mutable ovf_dir = "" - (* This is called early on in the conversion and lets us choose the * name of the target files that eventually get written by the main * code. @@ -98,13 +97,12 @@ object ) vdsm_params.image_...

...nversion and lets us choose the * name of the target files that eventually get written by the main * code. @@ -98,13 +97,12 @@ object eprintf "VDSM: image directory: %s\n%!" image_dir; (* Note that VDSM has to create this directory too. *) - ovf_dir <- dd_mp // dd_uuid // "master" // "vms" // vdsm_params.vm_uuid; - if not (is_directory ovf_dir) then + if not (is_directory vdsm_params.ovf_output) then error (f_"OVF (metadata) directory (%s) does not exist or is not a directory") - ovf_dir; + vdsm_params.ovf_...

...Output_rhev.mount_and_check_storage_domain verbose (s_"Data Domain") os in > + let pos = (String.length os) - 36 in > + let mp = String.sub os 0 (pos-1) in > + let uuid = String.sub os pos 36 in What is the significance of 36 here? > dd_mp <- mp; > dd_uuid <- uuid; > if verbose then > diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod > index a48bf59..cfd55fc 100644 > --- a/v2v/virt-v2v.pod > +++ b/v2v/virt-v2v.pod > @@ -456,7 +456,8 @@ See L</OUTPUT TO RHEV> below. > > Set the output method to I<vdsm>. &g...

...| uuid :: rest + when String.length uuid = 36 -> + let mp = String.concat "/" (List.rev rest) in + mp, uuid + | _ -> + error (f_"vdsm: invalid -os parameter does not contain a valid UUID: %s") + os in + dd_mp <- mp; dd_uuid <- uuid; if verbose then diff --git a/v2v/test-v2v-o-vdsm-options.sh b/v2v/test-v2v-o-vdsm-options.sh index e2098fa..c170467 100755 --- a/v2v/test-v2v-o-vdsm-options.sh +++ b/v2v/test-v2v-o-vdsm-options.sh @@ -64,7 +64,7 @@ mkdir $d/12345678-1234-1234-1234-123456789abc/master/vms/VM $VG...

...let mp = String.concat "/" (List.rev rest) in > > + mp, uuid > > + | _ -> > > + error (f_"vdsm: invalid -os parameter does not contain a valid UUID: %s") > > + os in > > + > > dd_mp <- mp; > > dd_uuid <- uuid; > > if verbose then > > diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod > > index a48bf59..2eb0079 100644 > > --- a/v2v/virt-v2v.pod > > +++ b/v2v/virt-v2v.pod > > @@ -456,8 +456,10 @@ See L</OUTPUT TO RHEV> below. > > > > S...

On 20.01.15 14:48, Richard W.M. Jones wrote: > On Tue, Jan 20, 2015 at 04:25:20PM +0200, Shahar Havivi wrote: > > > > + let pos = (String.length os) - 36 in > > > > + let mp = String.sub os 0 (pos-1) in > > > > + let uuid = String.sub os pos 36 in > > > > > > What is the significance of 36 here? > > the length of uuid. >

...nversion and lets us choose the * name of the target files that eventually get written by the main * code. @@ -98,13 +97,12 @@ object eprintf "VDSM: image directory: %s\n%!" image_dir; (* Note that VDSM has to create this directory too. *) - ovf_dir <- dd_mp // dd_uuid // "master" // "vms" // vdsm_params.vm_uuid; - if not (is_directory ovf_dir) then + if not (is_directory vdsm_params.ovf_output) then error (f_"OVF (metadata) directory (%s) does not exist or is not a directory") - ovf_dir; + vdsm_params.ovf_...

...t;Data Domain") os in > > + let pos = (String.length os) - 36 in > > + let mp = String.sub os 0 (pos-1) in > > + let uuid = String.sub os pos 36 in > > What is the significance of 36 here? the length of uuid. > > > dd_mp <- mp; > > dd_uuid <- uuid; > > if verbose then > > diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod > > index a48bf59..cfd55fc 100644 > > --- a/v2v/virt-v2v.pod > > +++ b/v2v/virt-v2v.pod > > @@ -456,7 +456,8 @@ See L</OUTPUT TO RHEV> below. > > > > Se...

...eate_metadata source targets _ guestcaps inspect target_firmware = - (* See #supported_firmware above. *) - assert (target_firmware = TargetBIOS); - (* Create the metadata. *) let ovf = Create_ovf.create_ovf source targets guestcaps inspect + target_firmware output_alloc dd_uuid vdsm_options.image_uuids vdsm_options.vol_uuids diff --git a/v2v/test-v2v-o-rhv.ovf.expected b/v2v/test-v2v-o-rhv.ovf.expected index 7bcc456c5..c6bd05c56 100644 --- a/v2v/test-v2v-o-rhv.ovf.expected +++ b/v2v/test-v2v-o-rhv.ovf.expected @@ -25,6 +25,7 @@ <IsStateless>False&...

Add an optional parameter to disable this behaviour, so the Curl module in v2v won't print user-sensible data (like passwords). --- builder/checksums.ml | 1 - builder/downloader.ml | 1 - builder/sigchecker.ml | 1 - mllib/common_utils.ml | 4 +++- mllib/common_utils.mli | 7 +++++-- v2v/curl.ml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git

...t to the metadata file. *) let dir = esd_mp // esd_uuid // "master" // "vms" // vm_uuid in diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 828ad7bda..b2188dd8b 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -175,7 +175,8 @@ object output_alloc dd_uuid vdsm_params.image_uuids vdsm_params.vol_uuids - vdsm_params.vm_uuid in + vdsm_params.vm_uuid + true in (* Write it to the metadata file. *) let file = vdsm_params.ovf_output // vdsm_params.vm_uuid ^ ".ovf" in -- 2.16.1

changes in v2: - split patch in two - changed as per suggestions Tomáš Golembiovský (2): v2v: ovf: add firmware and machine type element v2v: enable UEFI for oVirt/RHV outputs v2v/create_ovf.ml | 12 +++++++++++- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 6 ++---- v2v/output_rhv_upload.ml | 4 ++--

The bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1161019 This makes a few other minor refactorings to the code. Rich.

The first two patches implement the change discussed here: https://www.redhat.com/archives/libguestfs/2016-April/msg00178.html The third patch fixes the mapping of inspection data to OVF VmType which was inherited directly from old virt-v2v and had never been changed. It had a number of problems. The fourth patch is only slightly related to the others. It adds an extra slow test to ensure that

This patch isn't quite complete (see ‘assert false’). Currently we have a bunch of ad hoc options like --vddk* and --vdsm* (and proposed to add --rhv*) to handle extra parameters for input and output modes/transports. This complicates the command line parsing and also the clarity of the command line (becauseit's not very obvious which options apply to which side of the conversion).