From 3d0900d3b6305583c7cf34af58f1f0469e346d21 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 24 Apr 2018 17:52:47 +0200 Subject: [PATCH] B #1699: Workaround not importing swap datastores --- .../lib/vcenter_driver/virtual_machine.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb index 99d43a83611..3894e92dba7 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -744,34 +744,34 @@ def get_vcenter_nics() def get_ipv6_prefix(ipv6, prefix_length) - ipSlice = ipv6.split(":").map{ |elem| elem.hex }.map{ |elem| - + ipSlice = ipv6.split(":").map{ |elem| elem.hex }.map{ |elem| + int, dec = elem.divmod(1) bin = "#{int.to_s(2)}" - + while dec > 0 int, dec = (dec * 2).divmod(1) bin << int.to_s end - + elem = bin }.map{ |elem| elem.rjust(16, '0') } - + ipChain = ipSlice.join prefix = ipChain[0, prefix_length] - + cont = 0 limit = prefix.length index = 0 slices = [] - + while cont < limit slices[index] = prefix.slice(cont, 4) slices[index] = slices[index].ljust(4, '0') index +=1 cont+=4 end - + finalPrefix = slices.map{|elem| "%0x" % elem.to_i(2) }.join.ljust(4, '0') return finalPrefix end @@ -823,7 +823,7 @@ def vm_to_one(vm_name) str << "IMPORT_STATE =\"#{@state}\"\n" # Get DS information - str << "VCENTER_DS_REF = \"#{@vm_info["datastore"].first._ref}\"\n" + str << "VCENTER_DS_REF = \"#{@vm_info["datastore"].last._ref}\"\n" vnc_port = nil keymap = VCenterDriver::VIHelper.get_default("VM/TEMPLATE/GRAPHICS/KEYMAP")