mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
process_task it accepts the body instead of the response excon object
This commit is contained in:
parent
164bf8b473
commit
0ad1a40588
8 changed files with 13 additions and 17 deletions
|
@ -196,9 +196,8 @@ module Fog
|
||||||
raise @e
|
raise @e
|
||||||
end
|
end
|
||||||
|
|
||||||
def process_task(request)
|
def process_task(response_body)
|
||||||
response = request
|
task = make_task_object(response_body)
|
||||||
task = make_task_object(response.body)
|
|
||||||
wait_and_raise_unless_success(task)
|
wait_and_raise_unless_success(task)
|
||||||
true
|
true
|
||||||
end
|
end
|
||||||
|
|
|
@ -15,11 +15,8 @@ module Fog
|
||||||
attribute :vapp_template_id
|
attribute :vapp_template_id
|
||||||
|
|
||||||
def instantiate(vapp_name, options={})
|
def instantiate(vapp_name, options={})
|
||||||
puts vapp_template_id
|
|
||||||
response = service.instantiate_vapp_template(vapp_name, vapp_template_id, options = {})
|
response = service.instantiate_vapp_template(vapp_name, vapp_template_id, options = {})
|
||||||
task = response.body[:Tasks][:Task]
|
service.process_task(response.body[:Tasks][:Task])
|
||||||
task[:id] = task[:href].split('/').last
|
|
||||||
service.tasks.new(task)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ module Fog
|
||||||
num_disk = element_name.scan(/\d+/).first.to_i
|
num_disk = element_name.scan(/\d+/).first.to_i
|
||||||
data.modify_hard_disk_size(num_disk, new_capacity)
|
data.modify_hard_disk_size(num_disk, new_capacity)
|
||||||
response = service.put_vm_disks(vm_id, data.disks)
|
response = service.put_vm_disks(vm_id, data.disks)
|
||||||
service.process_task(response)
|
service.process_task(response.body)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ module Fog
|
||||||
data = Fog::Generators::Compute::Vcloudng::Disks.new(all_disks)
|
data = Fog::Generators::Compute::Vcloudng::Disks.new(all_disks)
|
||||||
data.delete_hard_disk(num_disk)
|
data.delete_hard_disk(num_disk)
|
||||||
response = service.put_vm_disks(vm_id, data.disks)
|
response = service.put_vm_disks(vm_id, data.disks)
|
||||||
service.process_task(response)
|
service.process_task(response.body)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -35,7 +35,7 @@ module Fog
|
||||||
data = Fog::Generators::Compute::Vcloudng::Disks.new(@disks)
|
data = Fog::Generators::Compute::Vcloudng::Disks.new(@disks)
|
||||||
data.add_hard_disk(size)
|
data.add_hard_disk(size)
|
||||||
response = service.put_vm_disks(vm_id, data.disks)
|
response = service.put_vm_disks(vm_id, data.disks)
|
||||||
service.process_task(response)
|
service.process_task(response.body)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -34,10 +34,10 @@ module Fog
|
||||||
if progress.to_i == 0
|
if progress.to_i == 0
|
||||||
printf '.'
|
printf '.'
|
||||||
else
|
else
|
||||||
puts progress
|
print " #{progress} %\r"
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
puts status
|
puts " #{status}"
|
||||||
end
|
end
|
||||||
status != 'running'
|
status != 'running'
|
||||||
end
|
end
|
||||||
|
|
|
@ -38,7 +38,7 @@ module Fog
|
||||||
|
|
||||||
def power_on
|
def power_on
|
||||||
response = service.post_vm_poweron(id)
|
response = service.post_vm_poweron(id)
|
||||||
service.process_task(response)
|
service.process_task(response.body)
|
||||||
end
|
end
|
||||||
|
|
||||||
def tags
|
def tags
|
||||||
|
@ -71,7 +71,7 @@ module Fog
|
||||||
attributes[:memory] = new_memory.to_i
|
attributes[:memory] = new_memory.to_i
|
||||||
if not_first_set && has_changed
|
if not_first_set && has_changed
|
||||||
response = service.put_vm_memory(id, memory)
|
response = service.put_vm_memory(id, memory)
|
||||||
service.process_task(response)
|
service.process_task(response.body)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ module Fog
|
||||||
attributes[:cpu] = new_cpu.to_i
|
attributes[:cpu] = new_cpu.to_i
|
||||||
if not_first_set && has_changed
|
if not_first_set && has_changed
|
||||||
response = service.put_vm_cpu(id, cpu)
|
response = service.put_vm_cpu(id, cpu)
|
||||||
service.process_task(response)
|
service.process_task(response.body)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ module Fog
|
||||||
|
|
||||||
def save
|
def save
|
||||||
response = service.put_vm_customization(id, attributes)
|
response = service.put_vm_customization(id, attributes)
|
||||||
service.process_task(response)
|
service.process_task(response.body)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -22,7 +22,7 @@ module Fog
|
||||||
|
|
||||||
def save
|
def save
|
||||||
response = service.put_vm_network(id, attributes)
|
response = service.put_vm_network(id, attributes)
|
||||||
service.process_task(response)
|
service.process_task(response.body)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue