fog 1.1.1 → 1.2.0

data/lib/fog/providers.rb

@@ -1,6 +1,8 @@
 require 'fog/aws'
 require 'fog/bluebox'
 require 'fog/brightbox'
+require 'fog/cloudstack'
+require 'fog/clodo'
 require 'fog/dnsimple'
 require 'fog/dnsmadeeasy'
 require 'fog/dynect'
@@ -8,13 +10,15 @@ require 'fog/ecloud'
 require 'fog/glesys'
 require 'fog/go_grid'
 require 'fog/google'
+require 'fog/joyent'
 require 'fog/libvirt'
 require 'fog/linode'
 require 'fog/local'
-require 'fog/new_servers'
+require 'fog/bare_metal_cloud'
 require 'fog/ninefold'
 require 'fog/rackspace'
 require 'fog/openstack'
+require 'fog/ovirt'
 require 'fog/slicehost'
 require 'fog/storm_on_demand'
 require 'fog/vcloud'

data/lib/fog/rackspace/dns.rb

@@ -5,12 +5,20 @@ module Fog
   module DNS
     class Rackspace < Fog::Service
 
+      class CallbackError < Fog::Errors::Error
+        attr_reader :response, :message, :details
+        def initialize(response)
+          @response = response
+          @message = response.body['error']['message']
+          @details = response.body['error']['details']
+        end
+      end
+
       US_ENDPOINT = 'https://dns.api.rackspacecloud.com/v1.0'
       UK_ENDPOINT = 'https://lon.dns.api.rackspacecloud.com/v1.0'
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url
-      recognizes :rackspace_auth_token
+      recognizes :rackspace_auth_url, :rackspace_auth_token, :rackspace_dns_endpoint
 
       model_path 'fog/rackspace/models/dns'
       model       :record

data/lib/fog/rackspace/load_balancers.rb

@@ -62,6 +62,9 @@ module Fog
       request :remove_monitor
       request :get_usage
       request :get_load_balancer_usage
+      request :get_error_page
+      request :set_error_page
+      request :remove_error_page
 
       module Shared
 

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

@@ -34,6 +34,8 @@ module Fog
             1/2.0
           when 15872
             1
+          when 30720
+            2
           end
         end
 

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

@@ -9,9 +9,9 @@ module Fog
         identity :id
 
         attribute :addresses
-        attribute :flavor_id,   :aliases => 'flavorId'
+        attribute :flavor_id,   :aliases => 'flavorId', :type => :integer
         attribute :host_id,     :aliases => 'hostId'
-        attribute :image_id,    :aliases => 'imageId'
+        attribute :image_id,    :aliases => 'imageId',  :type => :integer
         attribute :metadata
         attribute :name
         attribute :personality

data/lib/fog/rackspace/models/dns/callback.rb

@@ -11,8 +11,10 @@ module Fog
           response = nil
           Fog.wait_for(timeout, interval) do
             response = connection.callback job_id
-            if response.body['status'] != 'RUNNING'
+            if response.body['status'] == 'COMPLETED'
               true
+            elsif response.body['status'] == 'ERROR'
+              raise Fog::DNS::Rackspace::CallbackError.new(response)
             elsif retries == 0
               raise Fog::Errors::Error.new("Wait on job #{job_id} took too long")
             else

data/lib/fog/rackspace/models/dns/record.rb

@@ -50,6 +50,10 @@ module Fog
             :data => value
           }
 
+          if priority
+            options[:priority] = priority
+          end
+
           response = wait_for_job connection.add_records(@zone.identity, [options]).body['jobId']
           merge_attributes(response.body['response']['records'].select {|record| record['name'] == self.name && record['type'] == self.type && record['data'] == self.value}.first)
           true

data/lib/fog/rackspace/models/load_balancers/load_balancer.rb

@@ -70,10 +70,6 @@ module Fog
           virtual_ips.load(new_virtual_ips)
         end
 
-        def connection_logging
-          attributes[:connection_logging]
-        end
-
         def enable_connection_logging
           requires :identity
           connection.set_connection_logging identity, true
@@ -94,7 +90,7 @@ module Fog
 
         def enable_health_monitor(type, delay, timeout, attempsBeforeDeactivation, options = {})
           requires :identity
-          connection.set_monitor(identity, type, delay, timeout, attempsBeforeDeactivation, options = {})
+          connection.set_monitor(identity, type, delay, timeout, attempsBeforeDeactivation, options)
           true
         end
 
@@ -164,6 +160,21 @@ module Fog
           connection.get_load_balancer_usage(identity, options).body
         end
 
+        def error_page
+          requires :identity
+          connection.get_error_page(identity).body['errorpage']['content']
+        end
+
+        def error_page=(content)
+          requires :identity
+          connection.set_error_page identity, content
+        end
+
+        def reset_error_page
+          requires :identity
+          connection.remove_error_page identity
+        end
+
         private
         def create
           requires :name, :protocol, :port, :virtual_ips, :nodes
@@ -200,16 +211,15 @@ module Fog
         def connection_logging=(new_value)
           if !new_value.nil? and new_value.is_a?(Hash)
             attributes[:connection_logging] = case new_value['enabled']
-                                              when 'true'
+                                              when true,'true'
                                                 true
-                                              when 'false'
+                                              when false,'false'
                                                 false
                                               end
           else
             attributes[:connection_logging] = new_value
           end
         end
-
       end
     end
   end

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

@@ -58,7 +58,11 @@ module Fog
 
           if @connection.cdn && @public
             # if public and CDN connection then update cdn to public
-            @public_url = connection.cdn.put_container(key, 'X-CDN-Enabled' => 'True').headers['X-CDN-URI']
+            uri_header = 'X-CDN-URI'
+            if connection.rackspace_cdn_ssl == true
+              uri_header = 'X-CDN-SSL-URI'
+            end
+            @public_url = connection.cdn.put_container(key, 'X-CDN-Enabled' => 'True').headers[uri_header]
           elsif @connection.cdn && !@public
             connection.cdn.put_container(key, 'X-CDN-Enabled' => 'False')
             @public_url = nil

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

@@ -29,6 +29,13 @@ module Fog
           @directory
         end
 
+        def copy(target_directory_key, target_file_key, options={})
+          requires :directory, :key
+          connection.copy_object(directory.key, key, target_directory_key, target_file_key)
+          target_directory = connection.directories.new(:key => target_directory_key)
+          target_directory.files.get(target_file_key)
+        end
+
         def destroy
           requires :directory, :key
           connection.delete_object(directory.key, key)

data/lib/fog/rackspace/requests/compute/create_image.rb

@@ -21,9 +21,7 @@ module Fog
               'serverId' => server_id
             }
           }
-          if options['name']
-            data['image']['name'] = options['name']
-          end
+          data['image'].merge!(options)
           request(
             :body     => MultiJson.encode(data),
             :expects  => 202,

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

@@ -4,10 +4,9 @@ module Fog
       class Real
         def delete_nodes(load_balancer_id, *node_ids)
           query_string = node_ids.collect { |node_id| "id=#{node_id}" }.join('&')
-          puts query_string
           request(
             :expects => [200, 202],
-            :path => "loadbalancers/#{load_balancer_id}/nodes?#{node_ids}",
+            :path => "loadbalancers/#{load_balancer_id}/nodes?#{query_string}",
             :method => 'DELETE'
           )
         end

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

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

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

@@ -2,11 +2,17 @@ module Fog
   module Rackspace
     class LoadBalancers
       class Real
-        def list_load_balancers
+        def list_load_balancers(options = {})
+          if options.has_key? :node_address
+            query_string = "?nodeaddress=#{options[:node_address]}"
+          else
+            query_string = ''
+          end
+
           request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => 'loadbalancers.json'
+            :path     => "loadbalancers.json?#{query_string}"
           )
         end
       end

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

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def remove_error_page(load_balancer_id)
+          request(
+            :expects => [200, 202],
+            :path => "loadbalancers/#{load_balancer_id}/errorpage",
+            :method => 'DELETE'
+          )
+         end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def set_error_page(load_balancer_id, content)
+          data = {
+            'errorpage' => {
+              'content' => content
+            }
+          }
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :path     => "loadbalancers/#{load_balancer_id}/errorpage",
+            :method   => 'PUT'
+          )
+         end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Fog
+  module Storage
+    class Rackspace
+      class Real
+
+        # Copy object
+        #
+        # ==== Parameters
+        # * source_container_name<~String> - Name of source bucket
+        # * source_object_name<~String> - Name of source object
+        # * target_container_name<~String> - Name of bucket to create copy in
+        # * target_object_name<~String> - Name for new copy of object
+        # * options<~Hash> - Additional headers
+        def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options={})
+          headers = { 'X-Copy-From' => "/#{source_container_name}/#{source_object_name}" }.merge(options)
+          request({
+            :expects  => 201,
+            :headers  => headers,
+            :method   => 'PUT',
+            :path     => "#{Fog::Rackspace.escape(target_container_name)}/#{Fog::Rackspace.escape(target_object_name)}"
+          })
+        end
+
+      end
+    end
+  end
+end

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

@@ -10,12 +10,18 @@ module Fog
         # * object<~String> - Name of object to look for
         #
         def get_object(container, object, &block)
-          request({
+          params = {}
+
+          if block_given?
+            params[:response_block] = Proc.new
+          end
+
+          request(params.merge!({
             :block    => block,
             :expects  => 200,
             :method   => 'GET',
             :path     => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
-          }, false, &block)
+          }), false)
         end
 
       end

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

@@ -15,11 +15,12 @@ module Fog
           data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)
           request(
-            :body     => data[:body],
-            :expects  => 201,
-            :headers  => headers,
-            :method   => 'PUT',
-            :path     => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
+            :body       => data[:body],
+            :expects    => 201,
+            :idempotent => true,
+            :headers    => headers,
+            :method     => 'PUT',
+            :path       => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
           )
         end
 

data/lib/fog/rackspace/storage.rb

@@ -15,6 +15,7 @@ module Fog
       collection  :files
 
       request_path 'fog/rackspace/requests/storage'
+      request :copy_object
       request :delete_container
       request :delete_object
       request :get_container

data/lib/fog/storm_on_demand/compute.rb

@@ -125,7 +125,7 @@ module Fog
           unless response.body.empty?
             response.body = MultiJson.decode(response.body)
           end
-          if response.body.keys.include?('full_error')
+          if response.body.has_key?('full_error')
             raise(Fog::Compute::StormOnDemand::Error, response.body.inspect)
           end
           response

data/lib/fog/vcloud/compute.rb

@@ -52,6 +52,20 @@ module Fog
         end
       end
 
+      def link_up
+        load_unless_loaded!
+        self.links.find{|l| l[:rel] == 'up' }
+      end
+
+      def self.has_up(item)
+        class_eval <<-EOS, __FILE__,__LINE__
+          def #{item}
+            load_unless_loaded!
+            connection.get_#{item}(link_up[:href])
+          end
+        EOS
+      end
+
     end
   end
 end
@@ -60,12 +74,16 @@ module Fog
   module Vcloud
     class Compute < Fog::Service
 
-      PATH   = '/api/v1.0'
+      BASE_PATH   = '/api'
+      DEFAULT_VERSION = '1.5'
+      SUPPORTED_VERSIONS = [ '1.5', '1.0' ]
       PORT   = 443
       SCHEME = 'https'
 
+      attr_writer :default_organization_uri
+
       requires   :vcloud_username, :vcloud_password, :vcloud_host
-      recognizes :vcloud_port, :vcloud_scheme, :vcloud_path, :vcloud_default_vdc
+      recognizes :vcloud_port, :vcloud_scheme, :vcloud_path, :vcloud_default_vdc, :vcloud_version, :vcloud_base_path
       recognizes :provider # remove post deprecation
 
       model_path 'fog/vcloud/models/compute'
@@ -81,8 +99,12 @@ module Fog
       collection :servers
       model :task
       collection :tasks
+      model :vapp
+      collection :vapps
       model :vdc
       collection :vdcs
+      model :organization
+      collection :organizations
 
       request_path 'fog/vcloud/requests/compute'
       request :clone_vapp
@@ -93,21 +115,15 @@ module Fog
       request :configure_vm_name_description
       request :configure_vm_disks
       request :delete_vapp
-      request :get_catalog
       request :get_catalog_item
       request :get_customization_options
-      request :get_network
       request :get_network_ip
       request :get_network_ips
       request :get_network_extensions
-      request :get_organization
-      request :get_task
       request :get_task_list
-      request :get_vapp
       request :get_vapp_template
       request :get_vm_disks
       request :get_vm_memory
-      request :get_vdc
       request :instantiate_vapp_template
       request :login
       request :power_off
@@ -131,13 +147,16 @@ module Fog
           def basic_request(*args)
             self.class_eval <<-EOS, __FILE__,__LINE__
               def #{args[0]}(uri)
-                request({
-                  :expects => #{args[1] || 200},
-                  :method  => '#{args[2] || 'GET'}',
-                  :headers => #{args[3] ? args[3].inspect : '{}'},
-                  :body => '#{args[4] ? args[4] : ''}',
-                  :parse => true,
-                  :uri     => uri })
+                request(
+                  {
+                    :expects => #{args[1] || 200},
+                    :method  => '#{args[2] || 'GET'}',
+                    :headers => #{args[3] ? args[3].inspect : '{}'},
+                    :body => '#{args[4] ? args[4] : ''}',
+                    :parse => true,
+                    :uri     => uri
+                  }
+                )
               end
             EOS
           end
@@ -154,9 +173,10 @@ module Fog
               end
             EOS
           end
-
         end
 
+        attr_reader :version
+
         def initialize(options = {})
           require 'builder'
           require 'fog/core/parser'
@@ -165,13 +185,15 @@ module Fog
           @connection_options = options[:connection_options] || {}
           @persistent = options[:persistent]
 
-          @username = options[:vcloud_username]
-          @password = options[:vcloud_password]
-          @host     = options[:vcloud_host]
-          @vdc_href     = options[:vcloud_default_vdc]
-          @path     = options[:vcloud_path]   || Fog::Vcloud::Compute::PATH
-          @port     = options[:vcloud_port]   || Fog::Vcloud::Compute::PORT
-          @scheme   = options[:vcloud_scheme] || Fog::Vcloud::Compute::SCHEME
+          @username  = options[:vcloud_username]
+          @password  = options[:vcloud_password]
+          @host      = options[:vcloud_host]
+          @vdc_href  = options[:vcloud_default_vdc]
+          @base_path = options[:vcloud_base_path]   || Fog::Vcloud::Compute::BASE_PATH
+          @version   = options[:vcloud_version]     || Fog::Vcloud::Compute::DEFAULT_VERSION
+          @path      = options[:vcloud_path]        || "#{@base_path}/v#{@version}"
+          @port      = options[:vcloud_port]        || Fog::Vcloud::Compute::PORT
+          @scheme    = options[:vcloud_scheme]      || Fog::Vcloud::Compute::SCHEME
         end
 
         def reload
@@ -214,10 +236,17 @@ module Fog
         end
 
         def xmlns
-          { "xmlns" => "http://www.vmware.com/vcloud/v1",
-            "xmlns:ovf" => "http://schemas.dmtf.org/ovf/envelope/1",
-            "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
-            "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema" }
+          if version == '1.0'
+            { "xmlns" => "http://www.vmware.com/vcloud/v1",
+              "xmlns:ovf" => "http://schemas.dmtf.org/ovf/envelope/1",
+              "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+              "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema" }
+          else
+            { 'xmlns' => "http://www.vmware.com/vcloud/v1.5",
+              "xmlns:ovf" => "http://schemas.dmtf.org/ovf/envelope/1",
+              "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+              "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema" }
+          end
         end
 
         # If the cookie isn't set, do a get_organizations call to set it
@@ -235,8 +264,23 @@ module Fog
           end
         end
 
-        private
 
+        def basic_request_params(uri,*args)
+          {
+            :expects => args[0] || 200,
+            :method  => args[1] || 'GET',
+            :headers => args[2] ? args[2].inspect : {},
+            :body => args[3] ? args[3] : '',
+            :parse => true,
+            :uri     => uri
+          }
+        end
+
+        def base_path_url
+          "#{@scheme}://#{@host}:#{@port}#{@base_path}"
+        end
+
+        private
         def ensure_parsed(uri)
           if uri.is_a?(String)
             URI.parse(uri)
@@ -273,6 +317,7 @@ module Fog
 
           # Set headers to an empty hash if none are set.
           headers = params[:headers] || {}
+          headers['Accept'] = 'application/*+xml;version=1.5' if version == '1.5'
 
           # Add our auth cookie to the headers
           if @cookie
@@ -289,14 +334,12 @@ module Fog
           })
 
           # Parse the response body into a hash
-          #puts response.body
           unless response.body.empty?
             if params[:parse]
               document = Fog::ToHashDocument.new
               parser = Nokogiri::XML::SAX::PushParser.new(document)
               parser << response.body
               parser.finish
-
               response.body = document.body
             end
           end
@@ -305,7 +348,25 @@ module Fog
         end
 
       end
+      def self.item_requests(*types)
+        types.each{|t| item_request(t) }
+      end
+      def self.item_request(type)
+        Fog::Vcloud::Compute::Real.class_eval <<-EOS, __FILE__,__LINE__
+          def get_#{type}(uri)
+            Fog::Vcloud::Compute::#{type.to_s.capitalize}.new(
+              self.request(basic_request_params(uri)).body.merge(
+                :connection => self,
+                :collection => Fog::Vcloud::Compute::#{type.to_s.capitalize}s.new(
+                  :connection => self
+                )
+              )
+            )
+          end
+        EOS
+      end
 
+      item_requests :organization, :vdc, :network, :vapp, :server, :catalog, :task
     end
   end
 end

data/lib/fog/vcloud/models/compute/catalog.rb

@@ -4,7 +4,7 @@ module Fog
       class Catalog < Fog::Vcloud::Model
 
         identity :href, :aliases => :Href
-
+        attribute :links, :aliases => :Link, :type => :array
         ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :type

data/lib/fog/vcloud/models/compute/catalog_item.rb

@@ -4,7 +4,7 @@ module Fog
       class CatalogItem < Fog::Vcloud::Model
 
         identity :href, :aliases => :Href
-
+        attribute :links, :aliases => :Link, :type => :array
         ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :type

data/lib/fog/vcloud/models/compute/catalogs.rb

@@ -7,23 +7,20 @@ module Fog
 
         model Fog::Vcloud::Compute::Catalog
 
+        attribute :organization_uri
+
         def all
-          data = connection.get_organization(organization_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
+          org_uri = self.organization_uri || connection.default_organization_uri
+          data = connection.get_organization(org_uri).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_catalog(uri)
-            new(data.body)
-          end
+          connection.get_catalog(uri)
         rescue Fog::Errors::NotFound
           nil
         end
 
-        def organization_uri
-          @organization_uri ||= connection.default_organization_uri
-        end
-
         def item_by_name(name)
           res = nil
           items = all.collect { |catalog| catalog.catalog_items }