fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/hp/models/compute/servers.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::HP::Server
 
         def all
-          data = connection.list_servers_detail.body['servers']
+          data = service.list_servers_detail.body['servers']
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.get_server_details(server_id).body['server']
+          if server = service.get_server_details(server_id).body['server']
             new(server)
           end
         rescue Fog::Compute::HP::NotFound

data/lib/fog/hp/models/storage/directories.rb

@@ -10,14 +10,14 @@ module Fog
         model Fog::Storage::HP::Directory
 
         def all
-          data = connection.get_containers.body
+          data = service.get_containers.body
           load(data)
         end
 
         def get(key, options = {})
           read_header = nil
           write_header = nil
-          data = connection.get_container(key, options)
+          data = service.get_container(key, options)
           directory = new(:key => key)
           for key, value in data.headers
             if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(key)
@@ -31,7 +31,7 @@ module Fog
           end
           # set the acl on the directory based on the headers
           if !(read_header.nil? && write_header.nil?)
-            directory.acl = connection.header_to_acl(read_header, write_header)
+            directory.acl = service.header_to_acl(read_header, write_header)
           end
           directory.files.merge_attributes(options)
           directory.files.instance_variable_set(:@loaded, true)

data/lib/fog/hp/models/storage/directory.rb

@@ -25,11 +25,11 @@ module Fog
 
         def destroy
           requires :key
-          connection.delete_container(key)
+          service.delete_container(key)
           # If CDN service is available, try to delete the container if it was CDN-enabled
           if cdn_enabled?
             begin
-              connection.cdn.delete_container(key)
+              service.cdn.delete_container(key)
             rescue Fog::CDN::HP::NotFound
               # ignore if cdn container not found
             end
@@ -43,7 +43,7 @@ module Fog
           @files ||= begin
             Fog::Storage::HP::Files.new(
               :directory    => self,
-              :connection   => connection
+              :service   => service
             )
           end
         end
@@ -68,9 +68,9 @@ module Fog
         def public_url
           requires :key
           @public_url ||= begin
-            begin response = connection.head_container(key)
+            begin response = service.head_container(key)
               # escape the key to cover for special char. in container names
-              url = "#{connection.url}/#{Fog::HP.escape(key)}"
+              url = "#{service.url}/#{Fog::HP.escape(key)}"
             rescue Fog::Storage::HP::NotFound => err
               nil
             end
@@ -79,7 +79,7 @@ module Fog
 
         def cdn_enable=(new_cdn_enable)
           @cdn_enable ||= false
-          if (!connection.cdn.nil? && connection.cdn.enabled?)
+          if (!service.cdn.nil? && service.cdn.enabled?)
             @cdn_enable = new_cdn_enable
           else
             # since cdn service is not activated, container cannot be cdn-enabled
@@ -88,8 +88,8 @@ module Fog
         end
 
         def cdn_enabled?
-          if (!connection.cdn.nil? && connection.cdn.enabled?)
-            begin response = connection.cdn.head_container(key)
+          if (!service.cdn.nil? && service.cdn.enabled?)
+            begin response = service.cdn.head_container(key)
               cdn_header = response.headers.fetch('X-Cdn-Enabled', nil)
               if (!cdn_header.nil? && cdn_header == 'True')
                 @cdn_enable = true
@@ -108,9 +108,9 @@ module Fog
           requires :key
           @cdn_public_url ||= begin
             # return the CDN public url from the appropriate uri from the header
-            begin response = connection.cdn.head_container(key)
+            begin response = service.cdn.head_container(key)
               if response.headers['X-Cdn-Enabled'] == 'True'
-                if connection.hp_cdn_ssl == true
+                if service.hp_cdn_ssl == true
                   response.headers.fetch('X-Cdn-Ssl-Uri', nil)
                 else
                   response.headers.fetch('X-Cdn-Uri', nil)
@@ -126,25 +126,25 @@ module Fog
           requires :key
           options = {}
           if @acl
-            options.merge!(connection.acl_to_header(@acl))
+            options.merge!(service.acl_to_header(@acl))
           end
-          connection.put_container(key, options)
+          service.put_container(key, options)
           # Added an extra check to see if CDN is enabled for the container
-          if (!connection.cdn.nil? && connection.cdn.enabled?)
+          if (!service.cdn.nil? && service.cdn.enabled?)
             # If CDN available, set the container to be CDN-enabled or not based on if it is marked as cdn_enable.
             if @cdn_enable
               # check to make sure that the container exists. If yes, cdn enable it.
-              begin response = connection.cdn.head_container(key)
+              begin response = service.cdn.head_container(key)
                 ### Deleting a container from CDN is much more expensive than flipping the bit to disable it
-                connection.cdn.post_container(key, {'X-CDN-Enabled' => 'True'})
+                service.cdn.post_container(key, {'X-CDN-Enabled' => 'True'})
               rescue Fog::CDN::HP::NotFound => err
-                connection.cdn.put_container(key)
+                service.cdn.put_container(key)
               end
             else
               # check to make sure that the container exists. If yes, cdn disable it.
-              begin response = connection.cdn.head_container(key)
+              begin response = service.cdn.head_container(key)
                 ### Deleting a container from CDN is much more expensive than flipping the bit to disable it
-                connection.cdn.post_container(key, {'X-CDN-Enabled' => 'False'})
+                service.cdn.post_container(key, {'X-CDN-Enabled' => 'False'})
               rescue Fog::CDN::HP::NotFound => err
                 # just continue, as container is not cdn-enabled.
               end

data/lib/fog/hp/models/storage/file.rb

@@ -31,14 +31,14 @@ module Fog
 
         def copy(target_directory_key, target_file_key)
           requires :directory, :key
-          target_directory = connection.directories.new(:key => target_directory_key)
-          connection.put_object(target_directory_key, target_file_key, nil, {'X-Copy-From' => "/#{directory.key}/#{key}" })
+          target_directory = service.directories.new(:key => target_directory_key)
+          service.put_object(target_directory_key, target_file_key, nil, {'X-Copy-From' => "/#{directory.key}/#{key}" })
           target_directory.files.get(target_file_key)
         end
 
         def destroy
           requires :directory, :key
-          connection.delete_object(directory.key, key)
+          service.delete_object(directory.key, key)
           true
         end
 
@@ -68,7 +68,7 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           options['Content-Type'] = content_type if content_type
-          data = connection.put_object(directory.key, key, body, options)
+          data = service.put_object(directory.key, key, body, options)
           merge_attributes(data.headers)
           self.content_length = Fog::Storage.get_body_size(body)
           true

data/lib/fog/hp/models/storage/files.rb

@@ -54,7 +54,7 @@ module Fog
 
         def get(key, &block)
           requires :directory
-          data = connection.get_object(directory.key, key, &block)
+          data = service.get_object(directory.key, key, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -82,7 +82,7 @@ module Fog
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key)
+          data = service.head_object(directory.key, key)
           file_data = data.headers.merge({
             :key => key
           })

data/lib/fog/ibm/models/compute/address.rb

@@ -37,7 +37,7 @@ module Fog
 
         def save
           requires :offering_id, :location
-          data = connection.create_address(location, offering_id,
+          data = service.create_address(location, offering_id,
                                            :vlan_id => vlan_id,
                                            :ip => ip)
           merge_attributes(data.body)
@@ -54,7 +54,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_address(id).body['success']
+          service.delete_address(id).body['success']
         end
       end
     end

data/lib/fog/ibm/models/compute/addresses.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Address
 
         def all
-          load(connection.list_addresses.body['addresses'])
+          load(service.list_addresses.body['addresses'])
         end
 
         def get(address_id)
           begin
-            address = connection.list_addresses.body
+            address = service.list_addresses.body
             new(address['addresses'].find{|address| address['id'] == address_id.to_s })
           rescue Fog::Compute::IBM::NotFound
             nil

data/lib/fog/ibm/models/compute/image.rb

@@ -42,7 +42,7 @@ module Fog
 
         def save
           requires :id, :volume_id
-          data = connection.create_image(id, volume_id)
+          data = service.create_image(id, volume_id)
           merge_attributes(data.body)
           data.body['success']
         end
@@ -56,12 +56,12 @@ module Fog
         end
 
         def clone(name, description)
-          connection.clone_image(id, name, description).body['ImageID']
+          service.clone_image(id, name, description).body['ImageID']
         end
 
         def destroy
           requires :id
-          connection.delete_image(id).body['success']
+          service.delete_image(id).body['success']
         end
 
       end

data/lib/fog/ibm/models/compute/images.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Image
 
         def all
-          load(connection.list_images.body['images'])
+          load(service.list_images.body['images'])
         end
 
         def get(image_id)
           begin
-            new(connection.get_image(image_id).body)
+            new(service.get_image(image_id).body)
           rescue Fog::Compute::IBM::NotFound
             nil
           end

data/lib/fog/ibm/models/compute/key.rb

@@ -12,13 +12,13 @@ module Fog
 
         def save
           requires :name
-          data = connection.create_key(name, public_key)
+          data = service.create_key(name, public_key)
           merge_attributes(data.body)
           data.body['keyName'] == name
         end
 
         def destroy
-          data = connection.delete_key(identity)
+          data = service.delete_key(identity)
           data.body['success']
         end
 

data/lib/fog/ibm/models/compute/keys.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Key
 
         def all
-          load(connection.list_keys.body['keys'])
+          load(service.list_keys.body['keys'])
         end
 
         def get(key_id)
           begin
-            new(connection.get_key(key_id).body)
+            new(service.get_key(key_id).body)
           rescue Fog::Compute::IBM::NotFound
             nil
           end
@@ -26,7 +26,7 @@ module Fog
         end
 
         def default=(key_name)
-          connection.modify_key(key_name, 'default' => true)
+          service.modify_key(key_name, 'default' => true)
         end
 
       end

data/lib/fog/ibm/models/compute/locations.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Location
 
         def all
-          load(connection.list_locations.body['locations'])
+          load(service.list_locations.body['locations'])
         end
 
         def get(location_id)
           begin
-            new(connection.get_location(location_id).body)
+            new(service.get_location(location_id).body)
           rescue Fog::Compute::IBM::NotFound
             nil
           end

data/lib/fog/ibm/models/compute/server.rb

@@ -59,7 +59,7 @@ module Fog
 
         def save
           requires :name, :image_id, :instance_type, :location_id
-          data = connection.create_instance(name, image_id, instance_type, location_id,
+          data = service.create_instance(name, image_id, instance_type, location_id,
                                             :key_name => key_name,
                                             :vlan_id => vlan_id,
                                             :secondary_ip => secondary_ip)
@@ -82,17 +82,17 @@ module Fog
 
         def reboot
           requires :id
-          connection.modify_instance(id, 'state' => 'restart').body['success']
+          service.modify_instance(id, 'state' => 'restart').body['success']
         end
 
         def destroy
           requires :id
-          connection.delete_instance(id).body['success']
+          service.delete_instance(id).body['success']
         end
 
         def rename(name)
           requires :id
-          if connection.modify_instance(id, 'name' => name).body["success"]
+          if service.modify_instance(id, 'name' => name).body["success"]
             attributes[:name] = name
           else
             return false
@@ -102,7 +102,7 @@ module Fog
 
         def allocate_ip(wait_for_ready=true)
           requires :location_id
-          new_ip = connection.addresses.new(:location => location_id)
+          new_ip = service.addresses.new(:location => location_id)
           new_ip.save
           new_ip.wait_for(Fog::IBM.timeout) { ready? } if wait_for_ready
           secondary_ip << new_ip
@@ -112,7 +112,7 @@ module Fog
         def addresses
           addys = secondary_ip.map {|ip| Fog::Compute[:ibm].addresses.new(ip) }
           # Set an ID, in case someone tries to save
-          addys << connection.addresses.new(attributes[:primary_ip].merge(
+          addys << service.addresses.new(attributes[:primary_ip].merge(
             :id => "0",
             :location => location_id,
             :state => 3
@@ -122,13 +122,13 @@ module Fog
 
         def attach(volume_id)
           requires :id
-          data = connection.modify_instance(id, {'type' => 'attach', 'storageID' => volume_id})
+          data = service.modify_instance(id, {'type' => 'attach', 'storageID' => volume_id})
           data.body
         end
 
         def detach(volume_id)
           requires :id
-          data = connection.modify_instance(id, {'type' => 'detach', 'storageID' => volume_id})
+          data = service.modify_instance(id, {'type' => 'detach', 'storageID' => volume_id})
           data.body
         end
 
@@ -143,7 +143,7 @@ module Fog
         # Sets expiration time - Pass an instance of Time.
         def expire_at(time)
           expiry_time = (time.tv_sec * 1000).to_i
-          data = connection.modify_instance(id, 'expirationTime' => expiry_time)
+          data = service.modify_instance(id, 'expirationTime' => expiry_time)
           if data.body['expirationTime'] == expiry_time
             attributes[:expires_at] = expiry_time
             true
@@ -159,12 +159,12 @@ module Fog
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
 
         def location
           requires :location_id
-          connection.locations.get(location_id)
+          service.locations.get(location_id)
         end
 
         def public_hostname
@@ -182,7 +182,7 @@ module Fog
            :name => name + " as of " + Time.now.strftime("%Y-%m-%d %H:%M"),
            :description => ""
          }.merge(opts)
-         connection.create_image(id, options[:name], options[:description]).body
+         service.create_image(id, options[:name], options[:description]).body
         end
         alias :create_image :to_image
       end

data/lib/fog/ibm/models/compute/servers.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Server
 
         def all
-          load(connection.list_instances.body['instances'])
+          load(service.list_instances.body['instances'])
         end
 
         def get(server_id)
           begin
-            new(connection.get_instance(server_id).body)
+            new(service.get_instance(server_id).body)
           rescue Fog::Compute::IBM::NotFound
             nil
           end

data/lib/fog/ibm/models/compute/vlans.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Vlan
 
         def all
-          load(connection.list_vlans.body['vlan'])
+          load(service.list_vlans.body['vlan'])
         end
 
         def get(vlan_id)
           begin
-            vlan = connection.list_vlans.body
+            vlan = service.list_vlans.body
             new(vlan['vlan'].find{|vlan| vlan['id'] == vlan_id.to_s })
           rescue Fog::Compute::IBM::NotFound
             nil