From 419193e46736a82888cc0e0e7d0fce6fdb5ae7f7 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 6 Sep 2017 19:04:25 +0200 Subject: [PATCH] Feature #5247: Enable disc and nic import for wild vms (cherry picked from commit b0eaefe61e1faf6d2b8d9c31129651f715bb9421) --- .../remotes/lib/vcenter_driver/importer.rb | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb b/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb index 7dbfab8069..d250063e9c 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb @@ -34,24 +34,24 @@ def self.import_wild(host_id, vm_ref, one_vm, template) wild = true sunstone = false - #error, template_disks = vcenter_vm.import_vcenter_disks(vc_uuid, dpool, ipool, sunstone) - #return OpenNebula::Error.new(error) if !error.empty? + error, template_disks = vcenter_vm.import_vcenter_disks(vc_uuid, dpool, ipool, sunstone) + return OpenNebula::Error.new(error) if !error.empty? - #template << template_disks + template << template_disks # Create images or get nics information for template - #error, template_nics = vcenter_vm.import_vcenter_nics(vc_uuid, - # npool, - # hpool, - # vc_name, - # vm_ref, - # wild, - # sunstone, - # vm_name) - # - #return OpenNebula::Error.new(error) if !error.empty? + error, template_nics = vcenter_vm.import_vcenter_nics(vc_uuid, + npool, + hpool, + vc_name, + vm_ref, + wild, + sunstone, + vm_name) + + return OpenNebula::Error.new(error) if !error.empty? - #template << template_nics + template << template_nics # Get DS_ID for the deployment, the wild VM needs a System DS dc_ref = vcenter_vm.get_dc.item._ref