fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/rackspace/requests/dns/add_records.rb

@@ -13,7 +13,11 @@ module Fog
                 'type' => record[:type],
                 'data' => record[:data]
               }
-
+              
+              if record.has_key? :ttl
+                record_data['ttl'] = record[:ttl]
+              end
+              
               if record.has_key? :priority
                 record_data['priority'] = record[:priority]
               end

data/lib/fog/rackspace/requests/load_balancers/get_content_caching.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def get_content_caching(load_balancer_id)
+          request(
+            :expects => 200,
+            :path => "loadbalancers/#{load_balancer_id}/contentcaching",
+            :method => 'GET'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/set_content_caching.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def set_content_caching(load_balancer_id, value)
+          data = {
+            'contentCaching' => {
+              'enabled' => value.to_s
+            }
+          }
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [200, 202],
+            :path     => "loadbalancers/#{load_balancer_id}/contentcaching",
+            :method   => 'PUT'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb

@@ -9,7 +9,7 @@ module Fog
         #
         # Once the key has been set with this request you should create new
         # Storage objects with the :rackspace_temp_url_key option then use
-        # the get_object_https_url method to generate expirign URLs.
+        # the get_object_https_url method to generate expiring URLs.
         #
         # *** CAUTION *** changing this secret key will invalidate any expiring
         # URLS generated with old keys.

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

@@ -8,44 +8,44 @@ module Fog
 
         identity :id, :aliases => 'drive'
 
-        attribute :name   
+        attribute :name
         attribute :user
         attribute :size
         attribute :claimed
         attribute :status
         attribute :imaging
         attribute :encryption_cipher, :aliases => 'encryption:cipher'
-        
+
         def save
           attributes = {}
-          
+
           if(identity)
-            attributes = connection.update_image(identity, allowed_attributes).body
+            attributes = service.update_image(identity, allowed_attributes).body
           else
             requires :name
             requires :size
-            attributes = connection.create_image(allowed_attributes).body
+            attributes = service.create_image(allowed_attributes).body
           end
-          
+
           merge_attributes(attributes)
           self
         end
-        
+
         def load_standard_image(standard_image_uuid)
           requires :identity
-          connection.load_standard_image(identity, standard_image_uuid)
+          service.load_standard_image(identity, standard_image_uuid)
         end
-        
+
         def ready?
           status.upcase == 'ACTIVE'
         end
 
         def destroy
           requires :identity
-          connection.destroy_image(identity)
+          service.destroy_image(identity)
           self
         end
-        
+
         def allowed_attributes
           allowed = [:name, :size]
           attributes.select {|k,v| allowed.include? k}

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Serverlove::Image
 
         def all
-          data = connection.get_images.body
+          data = service.get_images.body
           load(data)
         end
 
         def get(image_id)
-          data = connection.get_image(image_id).body
+          data = service.get_image(image_id).body
           new(data)
         end
 

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

@@ -8,7 +8,7 @@ module Fog
       class Server < Fog::Model
 
         identity :id, :aliases => 'server'
-        
+
         attribute :name
         attribute :cpu
         attribute :mem
@@ -21,33 +21,33 @@ module Fog
         attribute :persistent
         attribute :vnc
         attribute :vnc_password, :aliases => 'vnc:password'
-        attribute :status   
+        attribute :status
         attribute :user
         attribute :started
         attribute :nic_0_model, :aliases => 'nic:0:model'
         attribute :nic_0_dhcp,  :aliases => 'nic:0:dhcp'
-        
+
         def save
           attributes = {}
-          
+
           if(identity)
-            attributes = connection.update_server(identity, allowed_attributes).body
+            attributes = service.update_server(identity, allowed_attributes).body
           else
             requires :name
             requires :cpu
-            attributes = connection.create_server(self.defaults.merge(allowed_attributes)).body
+            attributes = service.create_server(self.defaults.merge(allowed_attributes)).body
           end
-          
+
           merge_attributes(attributes)
           self
         end
 
         def destroy
           requires :identity
-          connection.destroy_server(identity)
+          service.destroy_server(identity)
           self
         end
-        
+
         def allowed_attributes
           allowed = [
                       :name, :cpu, :smp, :mem, :persistent,
@@ -57,7 +57,7 @@ module Fog
                     ]
           attributes.select {|k,v| allowed.include? k}
         end
-        
+
         def self.defaults
           # TODO: Document default settings.
           # Note that VNC password standards are strict (need explaining)

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Serverlove::Server
 
         def all
-          data = connection.get_servers.body
+          data = service.get_servers.body
           load(data)
         end
 
         def get(server_id)
-          data = connection.get_server(server_id).body
+          data = service.get_server(server_id).body
           new(data)
         end
 

data/lib/fog/storm_on_demand/models/compute/balancer.rb

@@ -5,9 +5,9 @@ module Fog
     class StormOnDemand
 
       class Balancer < Fog::Model
-        
+
         identity :uniq_id
-        
+
         attribute :vip
         attribute :price
         attribute :name
@@ -20,17 +20,17 @@ module Fog
         def initialize(attributes={})
           super
         end
-        
+
         def add_node(options)
           requires :identity
-          connection.add_balancer_node({:uniq_id => identity}.merge!(options))
+          service.add_balancer_node({:uniq_id => identity}.merge!(options))
         end
-        
+
         def remove_node(options)
           requires :identity
-          connection.remove_balancer_node({:uniq_id => identity}.merge!(options))
+          service.remove_balancer_node({:uniq_id => identity}.merge!(options))
         end
-        
+
         end
 
     end

data/lib/fog/storm_on_demand/models/compute/balancers.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Balancer
 
         def all
-          data = connection.list_balancers.body['items']
+          data = service.list_balancers.body['items']
           load(data)
         end
 

data/lib/fog/storm_on_demand/models/compute/configs.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Config
 
         def all
-          data = connection.list_configs.body['items']
+          data = service.list_configs.body['items']
           load(data)
         end
 

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

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Image
 
         def all
-          data = connection.list_images.body['items']
+          data = service.list_images.body['items']
           load(data)
         end
 

data/lib/fog/storm_on_demand/models/compute/private_ips.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::StormOnDemand::PrivateIp
 
         def all
-          data = connection.list_private_ips.body['networks']
+          data = service.list_private_ips.body['networks']
           load(data)
         end
 
         def get(server_id)
-          if server_id && server = connection.get_private_ip(private_ip).body
+          if server_id && server = service.get_private_ip(private_ip).body
             new(server)
           elsif !server_id
             nil

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

@@ -33,13 +33,13 @@ module Fog
         end
 
         def create(options)
-          data = connection.create_server(options).body['servers']
+          data = service.create_server(options).body['servers']
           load(data)
         end
 
         def destroy
           requires :identity
-          connection.delete_server(:uniq_id => identity)
+          service.delete_server(:uniq_id => identity)
           true
         end
 
@@ -49,18 +49,18 @@ module Fog
 
         def reboot
           requires :identity
-          connection.reboot_server(:uniq_id => identity)
+          service.reboot_server(:uniq_id => identity)
           true
         end
 
         def clone(options)
           requires :identity
-          connection.clone_server({:uniq_id => identity}.merge!(options))
+          service.clone_server({:uniq_id => identity}.merge!(options))
           true
         end
         def resize(options)
           requires :identity
-          connection.resize_server({:uniq_id => identity}.merge!(options))
+          service.resize_server({:uniq_id => identity}.merge!(options))
           true
         end
       end

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::StormOnDemand::Server
 
         def all
-          data = connection.list_servers.body['items']
+          data = service.list_servers.body['items']
           load(data)
         end
 
         def get(uniq_id)
-          server = connection.get_server(:uniq_id => uniq_id).body
+          server = service.get_server(:uniq_id => uniq_id).body
           new(server)
         end
 

data/lib/fog/storm_on_demand/models/compute/stats.rb

@@ -9,7 +9,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Stat
 
         def get(options)
-          data = connection.get_stats(options).body
+          data = service.get_stats(options).body
           load(data)
         rescue Excon::Errors::Forbidden
           nil

data/lib/fog/storm_on_demand/models/compute/templates.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Template
 
         def all
-          data = connection.list_templates.body['items']
+          data = service.list_templates.body['items']
           load(data)
         end
 

data/lib/fog/terremark/models/shared/address.rb

@@ -12,7 +12,7 @@ module Fog
 
         def destroy
          requires :id
-         connection.delete_public_ip(id)
+         service.delete_public_ip(id)
          true
         end
 

data/lib/fog/terremark/models/shared/addresses.rb

@@ -4,13 +4,13 @@ module Fog
 
       module Mock
         def addresses(options = {})
-          Fog::Terremark::Shared::Addresses.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Addresses.new(options.merge(:service => self))
         end
       end
 
       module Real
         def addresses(options = {})
-          Fog::Terremark::Shared::Addresses.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Addresses.new(options.merge(:service => self))
         end
       end
 
@@ -19,11 +19,11 @@ module Fog
         model Fog::Terremark::Shared::Address
 
         def all
-          load(connection.get_public_ips(vdc_id).body['PublicIpAddresses'])
+          load(service.get_public_ips(vdc_id).body['PublicIpAddresses'])
         end
 
         def get(ip_id)
-          if ip_id && ip = connection.get_public_ip(ip_id).body
+          if ip_id && ip = service.get_public_ip(ip_id).body
             new(ip)
           elsif !ip_id
             nil
@@ -33,7 +33,7 @@ module Fog
         end
 
         def vdc_id
-          @vdc_id ||= connection.default_vdc_id
+          @vdc_id ||= service.default_vdc_id
         end
 
         private

data/lib/fog/terremark/models/shared/images.rb

@@ -8,23 +8,23 @@ module Fog
 
       module Mock
         def images(options = {})
-          Fog::Terremark::Shared::Images.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Images.new(options.merge(:service => self))
         end
       end
 
       module Real
         def images(options = {})
-          Fog::Terremark::Shared::Images.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Images.new(options.merge(:service => self))
         end
       end
 
       class Images < Fog::Collection
 
 
-        model Fog::Terremark::Shared::Image 
+        model Fog::Terremark::Shared::Image
 
         def all
-          data = connection.get_catalog(vdc_id).body['CatalogItems'].select do |entity|
+          data = service.get_catalog(vdc_id).body['CatalogItems'].select do |entity|
             entity['type'] == "application/vnd.vmware.vcloud.catalogItem+xml"
           end
           load(data)
@@ -32,7 +32,7 @@ module Fog
 
 
         def vdc_id
-          @vdc_id ||= connection.default_vdc_id
+          @vdc_id ||= service.default_vdc_id
         end
 
         private