fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/ovirt/models/compute/cluster.rb

@@ -10,7 +10,7 @@ module Fog
         attribute :raw
 
         def networks
-          connection.list_networks(id)
+          service.list_networks(id)
         end
 
         def to_s

data/lib/fog/ovirt/models/compute/clusters.rb

@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Cluster
 
         def all(filters = {})
-          load connection.list_clusters(filters)
+          load service.list_clusters(filters)
         end
 
         def get(id)
-          new connection.get_cluster(id)
+          new service.get_cluster(id)
         end
 
       end

data/lib/fog/ovirt/models/compute/interfaces.rb

@@ -14,16 +14,16 @@ module Fog
         def all(filters = {})
           requires :vm
           if vm.is_a? Fog::Compute::Ovirt::Server
-            load connection.list_vm_interfaces(vm.id)
+            load service.list_vm_interfaces(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
-            load connection.list_template_interfaces(vm.id)
+            load service.list_template_interfaces(vm.id)
           else
             raise 'interfaces should have vm or template'
           end
         end
 
         def get(id)
-          new connection.get_interface(id)
+          new service.get_interface(id)
         end
 
      end

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

@@ -46,51 +46,51 @@ module Fog
 
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def add_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.add_interface(id, attrs)
+          service.add_interface(id, attrs)
         end
 
         def update_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.update_interface(id, attrs)
+          service.update_interface(id, attrs)
         end
 
         def destroy_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.destroy_interface(id, attrs)
+          service.destroy_interface(id, attrs)
         end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def add_volume attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.add_volume(id, attrs)
+          service.add_volume(id, attrs)
         end
 
         def destroy_volume attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.destroy_volume(id, attrs)
+          service.destroy_volume(id, attrs)
         end
 
         def start(options = {})
           wait_for { stopped? } if options[:blocking]
-          connection.vm_action(:id =>id, :action => :start)
+          service.vm_action(:id =>id, :action => :start)
           reload
         end
 
         def stop(options = {})
-          connection.vm_action(:id =>id, :action => :stop)
+          service.vm_action(:id =>id, :action => :stop)
           reload
         end
 
@@ -100,26 +100,26 @@ module Fog
         end
 
         def suspend(options = {})
-          connection.vm_action(:id =>id, :action => :suspend)
+          service.vm_action(:id =>id, :action => :suspend)
           reload
         end
 
         def destroy(options = {})
           (stop unless stopped?) rescue nil #ignore failure, destroy the machine anyway.
           wait_for { stopped? }
-          connection.destroy_vm(:id => id)
+          service.destroy_vm(:id => id)
         end
 
         def ticket(options = {})
           raise "Can not set console ticket, Server is not ready. Server status: #{status}" unless ready?
-          connection.vm_ticket(id, options)
+          service.vm_ticket(id, options)
         end
 
         def save
-          if identity
-            connection.update_vm(attributes)
+          if persisted?
+            service.update_vm(attributes)
           else
-            self.id = connection.create_vm(attributes).id
+            self.id = service.create_vm(attributes).id
           end
           reload
         end

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

@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Server
 
         def all(filters = {})
-          load connection.list_virtual_machines(filters)
+          load service.list_virtual_machines(filters)
         end
 
         def get(id)
-          new connection.get_virtual_machine(id)
+          new service.get_virtual_machine(id)
         end
 
         def bootstrap(new_attributes = {})

data/lib/fog/ovirt/models/compute/template.rb

@@ -24,14 +24,14 @@ module Fog
 
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
@@ -41,12 +41,12 @@ module Fog
         end
 
         def destroy(options = {})
-          connection.client.destroy_template(id)
+          service.client.destroy_template(id)
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          connection.client.create_template(attributes)
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          service.client.create_template(attributes)
         end
 
         def to_s

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

@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Template
 
         def all(filters = {})
-          load connection.list_templates(filters)
+          load service.list_templates(filters)
         end
 
         def get(id)
-          new connection.get_template(id)
+          new service.get_template(id)
         end
 
       end

data/lib/fog/ovirt/models/compute/volumes.rb

@@ -14,16 +14,16 @@ module Fog
         def all(filters = {})
           requires :vm
           if vm.is_a? Fog::Compute::Ovirt::Server
-            load connection.list_vm_volumes(vm.id)
+            load service.list_vm_volumes(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
-            load connection.list_template_volumes(vm.id)
+            load service.list_template_volumes(vm.id)
           else
             raise 'volumes should have vm or template'
           end
         end
 
         def get(id)
-          new connection.get_volume(id)
+          new service.get_volume(id)
         end
 
      end

data/lib/fog/rackspace.rb

@@ -6,19 +6,28 @@ module Fog
 
     module Errors
       class ServiceError < Fog::Errors::Error
-        attr_reader :response_data
+        attr_reader :response_data, :status_code
+
+        def to_s
+          status_code ? "[HTTP #{status_code}] #{super}" : super
+        end
 
         def self.slurp(error)
-          if error.response.body.empty?
-            data = nil
-            message = nil
-          else
-            data = Fog::JSON.decode(error.response.body)
-            message = data['message']
+          data = nil
+          message = nil
+          status_code = nil
+          
+          if error.response
+            status_code = error.response.status            
+            unless error.response.body.empty?
+              data = Fog::JSON.decode(error.response.body)
+              message = data.values.first ? data.values.first['message'] : data['message']
+            end
           end
-
+          
           new_error = super(error, message)
           new_error.instance_variable_set(:@response_data, data)
+          new_error.instance_variable_set(:@status_code, status_code)          
           new_error
         end
       end
@@ -29,13 +38,13 @@ module Fog
       class ServiceUnavailable < ServiceError; end
 
       class BadRequest < ServiceError
-        #TODO - Need to find a bette way to print out these validation errors when they are thrown
+        #TODO - Need to find a better way to print out these validation errors when they are thrown
         attr_reader :validation_errors
 
         def self.slurp(error)
           new_error = super(error)
-          unless new_error.response_data.nil?
-            new_error.instance_variable_set(:@validation_errors, new_error.response_data['validationErrors'])
+          unless new_error.response_data.nil? or new_error.response_data['badRequest'].nil?
+            new_error.instance_variable_set(:@validation_errors, new_error.response_data['badRequest']['validationErrors'])
           end
           new_error
         end

data/lib/fog/rackspace/block_storage.rb

@@ -4,6 +4,7 @@ module Fog
   module Rackspace
     class BlockStorage < Fog::Service
 
+      class IdentifierTaken < Fog::Errors::Error; end
       class ServiceError < Fog::Rackspace::Errors::ServiceError; end
       class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
       class BadRequest < Fog::Rackspace::Errors::BadRequest; end

data/lib/fog/rackspace/compute_v2.rb

@@ -39,9 +39,13 @@ module Fog
       request :resize_server
       request :confirm_resize_server
       request :revert_resize_server
+      request :list_addresses
+      request :list_addresses_by_network
 
+      request :create_image
       request :list_images
       request :get_image
+      request :delete_image
 
       request :list_flavors
       request :get_flavor
@@ -52,9 +56,15 @@ module Fog
       request :delete_attachment
 
       class Mock
+        
+        def initialize(options)
+          # prevents service initialization errors. This method should be implemented
+        end
+        
         def request(params)
           Fog::Mock.not_implemented
         end
+        
       end
 
       class Real

data/lib/fog/rackspace/load_balancers.rb

@@ -50,6 +50,8 @@ module Fog
       request :list_algorithms
       request :get_connection_logging
       request :set_connection_logging
+      request :get_content_caching
+      request :set_content_caching
       request :create_access_rule
       request :list_access_rules
       request :delete_access_rule

data/lib/fog/rackspace/models/block_storage/snapshot.rb

@@ -26,7 +26,8 @@ module Fog
 
         def save(force = false)
           requires :volume_id
-          data = connection.create_snapshot(volume_id, {
+          raise IdentifierTaken.new('Resaving may cause a duplicate snapshot to be created') if persisted?
+          data = service.create_snapshot(volume_id, {
             :display_name => display_name,
             :display_description => display_description,
             :force => force
@@ -37,7 +38,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_snapshot(identity)
+          service.delete_snapshot(identity)
           true
         end
       end

data/lib/fog/rackspace/models/block_storage/snapshots.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::BlockStorage::Snapshot
 
         def all
-          data = connection.list_snapshots.body['snapshots']
+          data = service.list_snapshots.body['snapshots']
           load(data)
         end
 
         def get(snapshot_id)
-          data = connection.get_snapshot(snapshot_id).body['snapshot']
+          data = service.get_snapshot(snapshot_id).body['snapshot']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil

data/lib/fog/rackspace/models/block_storage/volume.rb

@@ -32,12 +32,18 @@ module Fog
         end
 
         def snapshots
-          connection.snapshots.select { |s| s.volume_id == identity }
+          service.snapshots.select { |s| s.volume_id == identity }
+        end
+
+        def create_snapshot(options={})
+          requires :identity
+          service.snapshots.create(options.merge(:volume_id => identity))
         end
 
         def save
           requires :size
-          data = connection.create_volume(size, {
+          raise IdentifierTaken.new('Resaving may cause a duplicate volume to be created') if persisted?
+          data = service.create_volume(size, {
             :display_name => display_name,
             :display_description => display_description,
             :volume_type => volume_type,
@@ -49,7 +55,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_volume(identity)
+          service.delete_volume(identity)
           true
         end
       end

data/lib/fog/rackspace/models/block_storage/volume_types.rb

@@ -9,16 +9,16 @@ module Fog
         model Fog::Rackspace::BlockStorage::VolumeType
 
         def all
-          data = connection.list_volume_types.body['volume_types']
+          data = service.list_volume_types.body['volume_types']
           load(data)
         end
 
         def get(volume_type_id)
-          data = connection.get_volume_type(volume_type_id).body['volume_type']
+          data = service.get_volume_type(volume_type_id).body['volume_type']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil
-        end   
+        end
       end
     end
   end

data/lib/fog/rackspace/models/block_storage/volumes.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::BlockStorage::Volume
 
         def all
-          data = connection.list_volumes.body['volumes']
+          data = service.list_volumes.body['volumes']
           load(data)
         end
 
         def get(volume_id)
-          data = connection.get_volume(volume_id).body['volume']
+          data = service.get_volume(volume_id).body['volume']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil

data/lib/fog/rackspace/models/compute/flavors.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Rackspace::Flavor
 
         def all
-          data = connection.list_flavors_detail.body['flavors']
+          data = service.list_flavors_detail.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor_details(flavor_id).body['flavor']
+          data = service.get_flavor_details(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::Rackspace::NotFound
           nil