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

- old
+ new

@@ -2,42 +2,42 @@ module Terremark module Shared module Mock def networks(options = {}) - Fog::Terremark::Shared::Networks.new(options.merge(:connection => self)) + Fog::Terremark::Shared::Networks.new(options.merge(:service => self)) end end module Real def networks(options = {}) - Fog::Terremark::Shared::Networks.new(options.merge(:connection => self)) + Fog::Terremark::Shared::Networks.new(options.merge(:service => self)) end end class Networks < Fog::Collection model Fog::Terremark::Shared::Network def all - data = connection.get_vdc(vdc_id).body['AvailableNetworks'].map do |network| - connection.get_network(network["href"].split("/").last).body + data = service.get_vdc(vdc_id).body['AvailableNetworks'].map do |network| + service.get_network(network["href"].split("/").last).body end load(data) end def get(network_id) - if network_id && network = connection.get_network(network_id).body + if network_id && network = service.get_network(network_id).body new(network) elsif !network_id nil end rescue Excon::Errors::Forbidden nil end def vdc_id - @vdc_id ||= connection.default_vdc_id + @vdc_id ||= service.default_vdc_id end private def vdc_id=(new_vdc_id)