fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

data/lib/fog/rackspace/compute_v2.rb

@@ -3,11 +3,35 @@ require 'fog/compute'
 module Fog
   module Compute
     class RackspaceV2 < Fog::Service
+      include Fog::Rackspace::Errors
 
       class ServiceError < Fog::Rackspace::Errors::ServiceError; end
       class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
       class BadRequest < Fog::Rackspace::Errors::BadRequest; end
 
+      class InvalidStateException < ::RuntimeError
+
+        attr_reader :desired_state
+        attr_reader :current_state
+
+        def initialize(desired_state, current_state)
+          @desired_state = desired_state
+          @current_state = current_state
+        end
+      end
+
+      class InvalidServerStateException < InvalidStateException
+        def to_s
+          "Server should have transitioned to '#{desired_state}' not '#{current_state}'"
+        end
+      end
+
+      class InvalidImageStateException < InvalidStateException
+         def to_s
+           "Image should have transitioned to '#{desired_state}' not '#{current_state}'"
+         end
+      end
+
       DFW_ENDPOINT = 'https://dfw.servers.api.rackspacecloud.com/v2'
       ORD_ENDPOINT = 'https://ord.servers.api.rackspacecloud.com/v2'
       LON_ENDPOINT = 'https://lon.servers.api.rackspacecloud.com/v2'
@@ -16,6 +40,8 @@ module Fog
       recognizes :rackspace_endpoint
       recognizes :rackspace_auth_url
       recognizes :rackspace_auth_token
+      recognizes :rackspace_region
+      recognizes :rackspace_compute_url
 
       model_path 'fog/rackspace/models/compute_v2'
       model :server
@@ -24,8 +50,12 @@ module Fog
       collection :flavors
       model :image
       collection :images
-      model :attachments
+      model :attachment
       collection :attachments
+      model :network
+      collection :networks
+      model :key_pair
+      collection :key_pairs
 
       request_path 'fog/rackspace/requests/compute_v2'
       request :list_servers
@@ -39,6 +69,8 @@ module Fog
       request :resize_server
       request :confirm_resize_server
       request :revert_resize_server
+      request :rescue_server
+      request :unrescue_server
       request :list_addresses
       request :list_addresses_by_network
 
@@ -55,77 +87,149 @@ module Fog
       request :list_attachments
       request :delete_attachment
 
-      class Mock
-        
+      request :list_metadata
+      request :set_metadata
+      request :update_metadata
+      request :get_metadata_item
+      request :set_metadata_item
+      request :delete_metadata_item
+
+      request :list_networks
+      request :get_network
+      request :create_network
+      request :delete_network
+
+      request :list_keypairs
+      request :create_keypair
+      request :delete_keypair
+      request :get_keypair
+
+      class Mock < Fog::Rackspace::Service
+        include Fog::Rackspace::MockData
+
         def initialize(options)
-          # prevents service initialization errors. This method should be implemented
+          @rackspace_api_key = options[:rackspace_api_key]
         end
-        
+
         def request(params)
           Fog::Mock.not_implemented
         end
-        
+
+        def response(params={})
+          body    = params[:body] || {}
+          status  = params[:status] || 200
+          headers = params[:headers] || {}
+
+          response = Excon::Response.new(:body => body, :headers => headers, :status => status)
+          if params.has_key?(:expects) && ![*params[:expects]].include?(response.status)
+            raise(Excon::Errors.status_error(params, response))
+          else response
+          end
+        end
       end
 
-      class Real
+      class Real < Fog::Rackspace::Service
+
         def initialize(options = {})
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_auth_url = options[:rackspace_auth_url]
+          setup_custom_endpoint(options)
           @rackspace_must_reauthenticate = false
           @connection_options = options[:connection_options] || {}
 
-          endpoint = options[:rackspace_endpoint] || DFW_ENDPOINT
-          uri = URI.parse(endpoint)
+          authenticate
+
+          deprecation_warnings(options)
 
-          @host = uri.host
           @persistent = options[:persistent] || false
-          @path = uri.path
-          @port = uri.port
-          @scheme = uri.scheme
+          @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
+        end
 
-          authenticate
+        def request(params, parse_json = true, &block)
+          super(params, parse_json, &block)
+        rescue Excon::Errors::NotFound => error
+          raise NotFound.slurp(error, self)
+        rescue Excon::Errors::BadRequest => error
+          raise BadRequest.slurp(error, self)
+        rescue Excon::Errors::InternalServerError => error
+          raise InternalServerError.slurp(error, self)
+        rescue Excon::Errors::HTTPStatusError => error
+          raise ServiceError.slurp(error, self)
+        end
+
+        def authenticate(options={})
+          super({
+            :rackspace_api_key => @rackspace_api_key,
+            :rackspace_username => @rackspace_username,
+            :rackspace_auth_url => @rackspace_auth_url,
+            :connection_options => @connection_options
+          })
+        end
 
-          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+        def service_name
+          :cloudServersOpenStack
         end
 
-        def request(params)
-          begin
-            response = @connection.request(params.merge!({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp error
-          rescue Excon::Errors::BadRequest => error
-            raise BadRequest.slurp error
-          rescue Excon::Errors::InternalServerError => error
-            raise InternalServerError.slurp error
-          rescue Excon::Errors::HTTPStatusError => error
-            raise ServiceError.slurp error
+        def request_id_header
+          "X-Compute-Request-Id"
+        end
+
+        def region
+          @rackspace_region
+        end
+
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_url)
+        end
+
+        private
+
+        def setup_custom_endpoint(options)
+          @rackspace_endpoint = Fog::Rackspace.normalize_url(options[:rackspace_compute_url] || options[:rackspace_endpoint])
+
+          if v2_authentication?
+            case @rackspace_endpoint
+            when DFW_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :dfw
+            when ORD_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :ord
+            when LON_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :lon
+            else
+              # we are actually using a custom endpoint
+              @rackspace_region = options[:rackspace_region] || :dfw
+            end
+          else
+            #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
+             @rackspace_endpoint ||= DFW_ENDPOINT
           end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+        end
+
+        def deprecation_warnings(options)
+          Fog::Logger.deprecation("The :rackspace_endpoint option is deprecated. Please use :rackspace_compute_url for custom endpoints") if options[:rackspace_endpoint]
+
+          if [DFW_ENDPOINT, ORD_ENDPOINT, LON_ENDPOINT].include?(@rackspace_endpoint) && v2_authentication?
+            regions = @identity_service.service_catalog.display_service_regions(service_name)
+            Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid regions for :rackspace_region are #{regions}.")
           end
-          response
         end
 
-        private
+        def append_tenant_v1(credentials)
+          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
 
-        def authenticate
-          options = {
-            :rackspace_api_key  => @rackspace_api_key,
-            :rackspace_username => @rackspace_username,
-            :rackspace_auth_url => @rackspace_auth_url
-          }
+          endpoint = @rackspace_endpoint || credentials['X-Server-Management-Url'] || DFW_ENDPOINT
+          @uri = URI.parse(endpoint)
+          @uri.path = "#{@uri.path}/#{account_id}"
+        end
+
+        def authenticate_v1(options)
           credentials = Fog::Rackspace.authenticate(options, @connection_options)
+          append_tenant_v1 credentials
           @auth_token = credentials['X-Auth-Token']
-          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
-          @path = "#{@path}/#{account_id}"
         end
       end
     end

data/lib/fog/rackspace/databases.rb

@@ -3,19 +3,23 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace'))
 module Fog
   module Rackspace
     class Databases < Fog::Service
+      include Fog::Rackspace::Errors
 
       class ServiceError < Fog::Rackspace::Errors::ServiceError; end
       class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
       class BadRequest < Fog::Rackspace::Errors::BadRequest; end
 
-      DFW_ENDPOINT = 'https://dfw.databases.api.rackspacecloud.com/v1.0/'
-      LON_ENDPOINT = 'https://lon.databases.api.rackspacecloud.com/v1.0/'
-      ORD_ENDPOINT = 'https://ord.databases.api.rackspacecloud.com/v1.0/'
+      DFW_ENDPOINT = 'https://dfw.databases.api.rackspacecloud.com/v1.0'
+      LON_ENDPOINT = 'https://lon.databases.api.rackspacecloud.com/v1.0'
+      ORD_ENDPOINT = 'https://ord.databases.api.rackspacecloud.com/v1.0'
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url
       recognizes :rackspace_auth_token
       recognizes :rackspace_endpoint
+      recognizes :rackspace_region
+      recognizes :rackspace_database_url
+
 
       model_path 'fog/rackspace/models/databases'
       model :flavor
@@ -49,71 +53,110 @@ module Fog
       request :create_user
       request :delete_user
 
-      class Mock
+      class Mock < Fog::Rackspace::Service
         def request(params)
           Fog::Mock.not_implemented
         end
       end
 
-      class Real
+      class Real < Fog::Rackspace::Service
+
+        def service_name
+          :cloudDatabases
+        end
+
+        def region
+          @rackspace_region
+        end
+
         def initialize(options = {})
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_auth_url = options[:rackspace_auth_url]
           @rackspace_must_reauthenticate = false
           @connection_options = options[:connection_options] || {}
+          setup_custom_endpoint(options)
+
+          authenticate
 
-          endpoint = options[:rackspace_endpoint] || DFW_ENDPOINT
-          uri = URI.parse(endpoint)
+          deprecation_warnings(options)
 
-          @host = uri.host
           @persistent = options[:persistent] || false
-          @path = uri.path
-          @port = uri.port
-          @scheme = uri.scheme
+          @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
+        end
 
-          authenticate
+        def request(params, parse_json = true, &block)
+          super(params, parse_json, &block)
+        rescue Excon::Errors::NotFound => error
+          raise NotFound.slurp(error, region)
+        rescue Excon::Errors::BadRequest => error
+          raise BadRequest.slurp error
+        rescue Excon::Errors::InternalServerError => error
+          raise InternalServerError.slurp error
+        rescue Excon::Errors::HTTPStatusError => error
+          raise ServiceError.slurp error
+        end
 
-          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_database_url)
         end
 
-        def request(params)
-          begin
-            response = @connection.request(params.merge!({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp error
-          rescue Excon::Errors::BadRequest => error
-            raise BadRequest.slurp error
-          rescue Excon::Errors::InternalServerError => error
-            raise InternalServerError.slurp error
-          rescue Excon::Errors::HTTPStatusError => error
-            raise ServiceError.slurp error
+        def authenticate(options={})
+          super({
+            :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_username => @rackspace_username,
+            :rackspace_auth_url => @rackspace_auth_url,
+            :connection_options => @connection_options
+          })
+        end
+
+        private
+
+        def setup_custom_endpoint(options)
+          @rackspace_endpoint = Fog::Rackspace.normalize_url(options[:rackspace_database_url] || options[:rackspace_endpoint])
+
+          if v2_authentication?
+            case @rackspace_endpoint
+            when DFW_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :dfw
+            when ORD_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :ord
+            when LON_ENDPOINT
+              @rackspace_endpoint = nil
+              @rackspace_region = :lon
+            else
+              # we are actually using a custom endpoint
+              @rackspace_region = options[:rackspace_region] || :dfw
+            end
+          else
+            #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
+             @rackspace_endpoint ||= DFW_ENDPOINT
           end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+        end
+
+        def deprecation_warnings(options)
+          Fog::Logger.deprecation("The :rackspace_endpoint option is deprecated. Please use :rackspace_database_url for custom endpoints") if options[:rackspace_endpoint]
+
+          if [DFW_ENDPOINT, ORD_ENDPOINT, LON_ENDPOINT].include?(@rackspace_endpoint) && v2_authentication?
+            regions = @identity_service.service_catalog.display_service_regions(service_name)
+            Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid region for :rackspace_region are #{regions}.")
           end
-          response
         end
 
-        private
+        def append_tenant_v1(credentials)
+          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
 
-        def authenticate
-          options = {
-            :rackspace_api_key  => @rackspace_api_key,
-            :rackspace_username => @rackspace_username,
-            :rackspace_auth_url => @rackspace_auth_url
-          }
+          endpoint = @rackspace_endpoint || credentials['X-Server-Management-Url'] || DFW_ENDPOINT
+          @uri = URI.parse(endpoint)
+          @uri.path = "#{@uri.path}/#{account_id}"
+        end
+
+        def authenticate_v1(options)
           credentials = Fog::Rackspace.authenticate(options, @connection_options)
+          append_tenant_v1 credentials
           @auth_token = credentials['X-Auth-Token']
-          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
-          @path = "#{@path}/#{account_id}"
         end
       end
     end

data/lib/fog/rackspace/dns.rb

@@ -4,6 +4,13 @@ require 'fog/dns'
 module Fog
   module DNS
     class Rackspace < Fog::Service
+      include Fog::Rackspace::Errors
+
+      class ServiceError < Fog::Rackspace::Errors::ServiceError; end
+      class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
+      class BadRequest < Fog::Rackspace::Errors::BadRequest; end
+      class Conflict < Fog::Rackspace::Errors::Conflict; end
+      class ServiceUnavailable < Fog::Rackspace::Errors::ServiceUnavailable; end
 
       class CallbackError < Fog::Errors::Error
         attr_reader :response, :message, :details
@@ -18,7 +25,7 @@ module Fog
       UK_ENDPOINT = 'https://lon.dns.api.rackspacecloud.com/v1.0'
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url, :rackspace_auth_token, :rackspace_dns_endpoint
+      recognizes :rackspace_auth_url, :rackspace_auth_token, :rackspace_dns_endpoint, :rackspace_dns_url, :rackspace_region
 
       model_path 'fog/rackspace/models/dns'
       model       :record
@@ -43,7 +50,7 @@ module Fog
       request :remove_records
       request :add_records
 
-      class Mock
+      class Mock < Fog::Rackspace::Service
 
         def initialize(options={})
           @rackspace_api_key = options[:rackspace_api_key]
@@ -71,61 +78,65 @@ module Fog
 
       end
 
-      class Real
+      class Real < Fog::Rackspace::Service
+
+        def service_name
+          :cloudDNS
+        end
+
+        def region
+          #Note: DNS does not currently support multiple regions
+          @rackspace_region
+        end
+
         def initialize(options={})
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_auth_url = options[:rackspace_auth_url]
           @connection_options = options[:connection_options] || {}
-          uri = URI.parse(options[:rackspace_dns_endpoint] || US_ENDPOINT)
+          @rackspace_endpoint = Fog::Rackspace.normalize_url(options[:rackspace_dns_url] || options[:rackspace_dns_endpoint])
+          @rackspace_region = options[:rackspace_region]
 
-          @auth_token, @account_id = *authenticate
-          @persistent = options[:persistent] || false
-          @path       = "#{uri.path}/#{@account_id}"
+          authenticate
+
+          deprecation_warnings(options)
 
-          @connection_options[:headers] ||= {}
-          @connection_options[:headers].merge!({ 'Content-Type' => 'application/json', 'X-Auth-Token' => @auth_token })
+          @persistent = options[:persistent] || false
+          @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
+        end
 
-          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_dns_url)
         end
 
         private
 
-        def request(params)
-          #TODO - Unify code with other rackspace services
+        def request(params, parse_json = true, &block)
           begin
-            response = @connection.request(params.merge!({
-              :path     => "#{@path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::BadRequest => error
-            raise Fog::Rackspace::Errors::BadRequest.slurp error
-          rescue Excon::Errors::Conflict => error
-            raise Fog::Rackspace::Errors::Conflict.slurp error
+            super(params, parse_json, &block)
           rescue Excon::Errors::NotFound => error
-            raise Fog::Rackspace::Errors::NotFound.slurp error
+            raise NotFound.slurp(error, region)
+          rescue Excon::Errors::BadRequest => error
+            raise BadRequest.slurp error
+          rescue Excon::Errors::InternalServerError => error
+            raise InternalServerError.slurp error
           rescue Excon::Errors::ServiceUnavailable => error
-            raise Fog::Rackspace::Errors::ServiceUnavailable.slurp error
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+            raise ServiceUnavailable.slurp error
+          rescue Excon::Errors::Conflict => error
+            raise Conflict.slurp error
+          rescue Excon::Errors::HTTPStatusError => error
+            raise ServiceError.slurp error
           end
-          response
-        end
-
-        def authenticate
-          options = {
-            :rackspace_api_key  => @rackspace_api_key,
-            :rackspace_username => @rackspace_username,
-            :rackspace_auth_url => @rackspace_auth_url
-          }
-          credentials = Fog::Rackspace.authenticate(options, @connection_options)
-          auth_token = credentials['X-Auth-Token']
-          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
-          [auth_token, account_id]
         end
 
         def array_to_query_string(arr)
-          arr.collect {|k,v| "#{k}=#{v}" }.join('&')
+          return "" unless arr
+          query_array = arr.collect do | k, v |
+            val_str = v.is_a?(Array) ? v.join(",") : v.to_s
+            "#{k}=#{val_str}"
+          end
+
+          query_array.join('&')
         end
 
         def validate_path_fragment(name, fragment)
@@ -133,6 +144,34 @@ module Fog
             raise ArgumentError.new("#{name} cannot be null or empty")
           end
         end
+
+        private
+
+        def deprecation_warnings(options)
+          Fog::Logger.deprecation("The :rackspace_dns_endpoint option is deprecated. Please use :rackspace_dns_url for custom endpoints") if options[:rackspace_dns_endpoint]
+        end
+
+        def setup_endpoint(credentials)
+          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
+
+          @uri = URI.parse(@rackspace_endpoint || US_ENDPOINT)
+          @uri.path = "#{@uri.path}/#{account_id}"
+        end
+
+        def authenticate_v1(options)
+          credentials = Fog::Rackspace.authenticate(options, @connection_options)
+          setup_endpoint credentials
+          @auth_token = credentials['X-Auth-Token']
+        end
+
+        def authenticate(options={})
+          super({
+            :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_username => @rackspace_username,
+            :rackspace_auth_url => @rackspace_auth_url,
+            :connection_options => @connection_options
+          })
+        end
       end
     end
   end