lib/fog/terremark/models/shared/tasks.rb in fog-maestrodev-1.7.0.20121114190951 vs lib/fog/terremark/models/shared/tasks.rb in fog-maestrodev-1.8.0.20130109172219

- old
+ new

@@ -5,41 +5,41 @@ module Terremark module Shared module Mock def tasks - Fog::Terremark::Shared::Tasks.new(:connection => self) + Fog::Terremark::Shared::Tasks.new(:service => self) end end module Real def tasks - Fog::Terremark::Shared::Tasks.new(:connection => self) + Fog::Terremark::Shared::Tasks.new(:service => self) end end class Tasks < Fog::Collection model Fog::Terremark::Shared::Task def all - data = connection.get_tasks_list(task_list_id).body['Tasks'] + data = service.get_tasks_list(task_list_id).body['Tasks'] load(data) end def get(task_id) - if task_id && task = connection.get_task(task_id).body + if task_id && task = service.get_task(task_id).body new(task) elsif !task_id nil end rescue Excon::Errors::Forbidden nil end def task_list_id @task_list_id ||= - if connection.default_organization_id && organization = connection.get_organization(connection.default_organization_id).body + if service.default_organization_id && organization = service.get_organization(service.default_organization_id).body organization['Links'].detect {|link| link['type'] == 'application/vnd.vmware.vcloud.tasksList+xml'}['href'].split('/').last.to_i else nil end end