search for: s_vnet_orig

...b6713..17ad61d 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -75,6 +75,7 @@ class input_disk input_format disk = object (* Give the guest a simple generic network interface. *) let network = { s_mac = None; + s_nic_model = None; s_vnet = "default"; s_vnet_orig = "default"; s_vnet_type = Network } in @@ -89,6 +90,7 @@ class input_disk input_format disk = object s_display = Some { s_display_type = Window; s_keymap = None; s_password = None; s_listen = LNone; s_port = None }; + s_video = None;...

...b6713..17ad61d 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -75,6 +75,7 @@ class input_disk input_format disk = object (* Give the guest a simple generic network interface. *) let network = { s_mac = None; + s_nic_model = None; s_vnet = "default"; s_vnet_orig = "default"; s_vnet_type = Network } in @@ -89,6 +90,7 @@ class input_disk input_format disk = object s_display = Some { s_display_type = Window; s_keymap = None; s_password = None; s_listen = LNone; s_port = None }; + s_video = None;...

...b6713..17ad61d 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -75,6 +75,7 @@ class input_disk input_format disk = object (* Give the guest a simple generic network interface. *) let network = { s_mac = None; + s_nic_model = None; s_vnet = "default"; s_vnet_orig = "default"; s_vnet_type = Network } in @@ -89,6 +90,7 @@ class input_disk input_format disk = object s_display = Some { s_display_type = Window; s_keymap = None; s_password = None; s_listen = LNone; s_port = None }; + s_video = None;...

...t (sprintf"eth%d" i) (xpath_string "rasd:ElementName/text()") in + let mac = xpath_string "rasd:Address/text()" in let nic = { - s_mac = None; + s_mac = mac; s_nic_model = None; s_vnet = vnet; s_vnet_orig = vnet; -- 2.13.6

Deep in the discussion of this bug, unfortunately mostly in private comments: https://bugzilla.redhat.com/show_bug.cgi?id=1594515 we decided it'd be more flexible for RHV if we had a way to map individual NICs to target networks and bridges. This can be done by adding a new --mac option so you can specify the exact mapping you need: $ virt-v2v [...] \ --mac

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...ResourceSubType/text()" with + | Some "E1000" -> Some Source_e1000 + | Some _ -> None (* Warn? *) + | None -> None in let nic = { s_mac = mac; - s_nic_model = None; + s_nic_model = nic_model; s_vnet = vnet; s_vnet_orig = vnet; s_vnet_type = vnet_type; diff --git a/v2v/test-v2v-i-ova-formats.expected b/v2v/test-v2v-i-ova-formats.expected index 5e2fabfa9..f7b79d7bc 100644 --- a/v2v/test-v2v-i-ova-formats.expected +++ b/v2v/test-v2v-i-ova-formats.expected @@ -17,5 +17,5 @@ disks: removable media: CD-ROM...

..._SCSI | Source_virtio_blk -(** Source disk controller. +(** Source disk controller (in ascending order of preference). For the purposes of this field, we can treat virtio-scsi as [SCSI]. However we don't support conversions from virtio in any @@ -88,7 +88,7 @@ and source_nic = { s_vnet_orig : string; (** Original network (if we map it). *) s_vnet_type : vnet_type; (** Source network type. *) } -(** Network adapter models. *) +(** Network adapter models (in ascending order of preference). *) and s_nic_model = Source_rtl8139 | Source_e1000 | Source_vir...

..._SCSI | Source_virtio_blk -(** Source disk controller. +(** Source disk controller (in ascending order of preference). For the purposes of this field, we can treat virtio-scsi as [SCSI]. However we don't support conversions from virtio in any @@ -88,7 +88,7 @@ and source_nic = { s_vnet_orig : string; (** Original network (if we map it). *) s_vnet_type : vnet_type; (** Source network type. *) } -(** Network adapter models. *) +(** Network adapter models (in ascending order of preference). *) and s_nic_model = Source_other_nic of string |...

...| Some "E1000" -> Some Source_e1000 > + | Some _ -> None (* Warn? *) > + | None -> None in > let nic = { > s_mac = mac; > - s_nic_model = None; > + s_nic_model = nic_model; > s_vnet = vnet; > s_vnet_orig = vnet; > s_vnet_type = vnet_type; > diff --git a/v2v/test-v2v-i-ova-formats.expected b/v2v/test-v2v-i-ova-formats.expected > index 5e2fabfa9..f7b79d7bc 100644 > --- a/v2v/test-v2v-i-ova-formats.expected > +++ b/v2v/test-v2v-i-ova-formats.expected > @@ -17,5 +17,5 @@ disk...

.../text()" with + | Some connection -> connection, Bridge + | None -> sprintf"eth%d" i, Network in let mac = xpath_string "rasd:Address/text()" in let nic = { s_mac = mac; s_nic_model = None; s_vnet = vnet; s_vnet_orig = vnet; - s_vnet_type = Network; + s_vnet_type = vnet_type; } in List.push_front nic nics done; diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index caf9c983e..097bab453 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -16,7 +16,7 @@ virt-v2v - Convert a gu...

...Xml.xpathobj_node obj i in - Xml.xpathctx_set_current_context xpathctx n; - let vnet = - xpath_string_default "rasd:ElementName/text()" (sprintf"eth%d" i) in - let nic = { - s_mac = None; - s_nic_model = None; - s_vnet = vnet; - s_vnet_orig = vnet; - s_vnet_type = Network; - } in - push_front nic nics - done; + "driver", JSON.String "raw"; + "offset", JSON.Int64 offset; + "size", JSON.Int64 size;...

When importing from VMware via the libvirt driver, the libvirt driver can add an empty source bridge name: <interface type='bridge'> <mac address='00:01:02:03:04:05:06'/> <source bridge=''/> </interface> Replicate what we do on the -i ova path, and map these to "eth0", "eth1" etc. This also includes a bunch

...Source disk controller. > +(** Source disk controller (in ascending order of preference). > > For the purposes of this field, we can treat virtio-scsi as > [SCSI]. However we don't support conversions from virtio in any > @@ -88,7 +88,7 @@ and source_nic = { > s_vnet_orig : string; (** Original network (if we map it). *) > s_vnet_type : vnet_type; (** Source network type. *) > } > -(** Network adapter models. *) > +(** Network adapter models (in ascending order of preference). *) > and s_nic_model = Source_other_nic o...

A couple of patches cleaning up the -i ova code. These are both just refactoring (or should be at any rate). The second patch is best viewed with 'git show -w' to exclude whitespace changes. Rich.

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.