diff --git a/lib/fog/vcloudng/compute.rb b/lib/fog/vcloudng/compute.rb index 44fb74a67..d644aa44f 100644 --- a/lib/fog/vcloudng/compute.rb +++ b/lib/fog/vcloudng/compute.rb @@ -196,9 +196,8 @@ module Fog raise @e end - def process_task(request) - response = request - task = make_task_object(response.body) + def process_task(response_body) + task = make_task_object(response_body) wait_and_raise_unless_success(task) true end diff --git a/lib/fog/vcloudng/models/compute/catalog_item.rb b/lib/fog/vcloudng/models/compute/catalog_item.rb index 82a170da5..5b8f42c7e 100644 --- a/lib/fog/vcloudng/models/compute/catalog_item.rb +++ b/lib/fog/vcloudng/models/compute/catalog_item.rb @@ -15,11 +15,8 @@ module Fog attribute :vapp_template_id def instantiate(vapp_name, options={}) - puts vapp_template_id response = service.instantiate_vapp_template(vapp_name, vapp_template_id, options = {}) - task = response.body[:Tasks][:Task] - task[:id] = task[:href].split('/').last - service.tasks.new(task) + service.process_task(response.body[:Tasks][:Task]) end diff --git a/lib/fog/vcloudng/models/compute/disk.rb b/lib/fog/vcloudng/models/compute/disk.rb index 8c6087408..6279b78cf 100644 --- a/lib/fog/vcloudng/models/compute/disk.rb +++ b/lib/fog/vcloudng/models/compute/disk.rb @@ -33,7 +33,7 @@ module Fog num_disk = element_name.scan(/\d+/).first.to_i data.modify_hard_disk_size(num_disk, new_capacity) response = service.put_vm_disks(vm_id, data.disks) - service.process_task(response) + service.process_task(response.body) end end @@ -46,7 +46,7 @@ module Fog data = Fog::Generators::Compute::Vcloudng::Disks.new(all_disks) data.delete_hard_disk(num_disk) response = service.put_vm_disks(vm_id, data.disks) - service.process_task(response) + service.process_task(response.body) end end diff --git a/lib/fog/vcloudng/models/compute/disks.rb b/lib/fog/vcloudng/models/compute/disks.rb index 611149836..45b51ce61 100644 --- a/lib/fog/vcloudng/models/compute/disks.rb +++ b/lib/fog/vcloudng/models/compute/disks.rb @@ -35,7 +35,7 @@ module Fog data = Fog::Generators::Compute::Vcloudng::Disks.new(@disks) data.add_hard_disk(size) response = service.put_vm_disks(vm_id, data.disks) - service.process_task(response) + service.process_task(response.body) end private diff --git a/lib/fog/vcloudng/models/compute/task.rb b/lib/fog/vcloudng/models/compute/task.rb index 730f07630..f352fd1dc 100644 --- a/lib/fog/vcloudng/models/compute/task.rb +++ b/lib/fog/vcloudng/models/compute/task.rb @@ -34,10 +34,10 @@ module Fog if progress.to_i == 0 printf '.' else - puts progress + print " #{progress} %\r" end else - puts status + puts " #{status}" end status != 'running' end diff --git a/lib/fog/vcloudng/models/compute/vm.rb b/lib/fog/vcloudng/models/compute/vm.rb index f22956fa9..9f3d0170d 100644 --- a/lib/fog/vcloudng/models/compute/vm.rb +++ b/lib/fog/vcloudng/models/compute/vm.rb @@ -38,7 +38,7 @@ module Fog def power_on response = service.post_vm_poweron(id) - service.process_task(response) + service.process_task(response.body) end def tags @@ -71,7 +71,7 @@ module Fog attributes[:memory] = new_memory.to_i if not_first_set && has_changed response = service.put_vm_memory(id, memory) - service.process_task(response) + service.process_task(response.body) end end @@ -81,7 +81,7 @@ module Fog attributes[:cpu] = new_cpu.to_i if not_first_set && has_changed response = service.put_vm_cpu(id, cpu) - service.process_task(response) + service.process_task(response.body) end end diff --git a/lib/fog/vcloudng/models/compute/vm_customization.rb b/lib/fog/vcloudng/models/compute/vm_customization.rb index 3c0c737f6..a38a971cc 100644 --- a/lib/fog/vcloudng/models/compute/vm_customization.rb +++ b/lib/fog/vcloudng/models/compute/vm_customization.rb @@ -32,7 +32,7 @@ module Fog def save response = service.put_vm_customization(id, attributes) - service.process_task(response) + service.process_task(response.body) end end diff --git a/lib/fog/vcloudng/models/compute/vm_network.rb b/lib/fog/vcloudng/models/compute/vm_network.rb index b3d0fb2e3..6760cad43 100644 --- a/lib/fog/vcloudng/models/compute/vm_network.rb +++ b/lib/fog/vcloudng/models/compute/vm_network.rb @@ -22,7 +22,7 @@ module Fog def save response = service.put_vm_network(id, attributes) - service.process_task(response) + service.process_task(response.body) end end