lib/fog/vcloud/models/compute/networks.rb in fog-maestrodev-1.7.0.20121114190951 vs lib/fog/vcloud/models/compute/networks.rb in fog-maestrodev-1.8.0.20130109172219

@@ -11,33 +11,33 @@
         model Fog::Vcloud::Compute::Network
 
         attribute :href
 
         def all
-          self.href = connection.default_vdc_href unless self.href
+          self.href = service.default_vdc_href unless self.href
           data = nil
           if self.href =~ /\/vdc\//
             check_href!("Vdc")
-            data = [connection.get_vdc(self.href).available_networks].flatten.compact.reject{|n| n == '' }
+            data = [service.get_vdc(self.href).available_networks].flatten.compact.reject{|n| n == '' }
           elsif self.href =~ /\/org\//
             check_href!("Org")
-            data = connection.get_organization(self.href).links.select{|l| l[:type] == network_type_id }
+            data = service.get_organization(self.href).links.select{|l| l[:type] == network_type_id }
           elsif self.href =~ /\/vApp\//
             check_href!("Vapp")
-            data = [(connection.get_vapp(self.href).network_configs||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact
+            data = [(service.get_vapp(self.href).network_configs||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact
           end
           load([*data]) unless data.nil?
         end
 
         def get(uri)
-          connection.get_network(uri)
+          service.get_network(uri)
         rescue Fog::Errors::NotFound
           nil
         end
 
         private
         def network_type_id
-          if connection.version == '1.0'
+          if service.version == '1.0'
             'application/vnd.vmware.vcloud.network+xml'
           else
             'application/vnd.vmware.vcloud.orgNetwork+xml'
           end
         end