fog 1.10.0 → 1.10.1

data/lib/fog/rackspace/compute.rb

@@ -7,7 +7,7 @@ module Fog
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
-      recognizes :rackspace_auth_token, :rackspace_management_url
+      recognizes :rackspace_auth_token, :rackspace_management_url, :rackspace_compute_v1_url, :rackspace_region
 
       model_path 'fog/rackspace/models/compute'
       model       :flavor
@@ -41,7 +41,7 @@ module Fog
       request :server_action
       request :update_server
 
-      class Mock
+      class Mock < Fog::Rackspace::Service
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -180,7 +180,7 @@ module Fog
 
       end
 
-      class Real
+      class Real < Fog::Rackspace::Service
 
         def initialize(options={})
           @rackspace_api_key = options[:rackspace_api_key]
@@ -188,13 +188,13 @@ module Fog
           @rackspace_auth_url = options[:rackspace_auth_url]
           @rackspace_servicenet = options[:rackspace_servicenet]
           @rackspace_auth_token = options[:rackspace_auth_token]
-          @rackspace_management_url = options[:rackspace_management_url]
+          @rackspace_endpoint = Fog::Rackspace.normalize_url(options[:rackspace_compute_v1_url] || options[:rackspace_management_url])
           @rackspace_must_reauthenticate = false
           @connection_options = options[:connection_options] || {}
           authenticate
-          Excon.ssl_verify_peer = false if options[:rackspace_servicenet] == true
+          Excon.defaults[:ssl_verify_peer] = false if service_net?
           @persistent = options[:persistent] || false
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
         end
 
         def reload
@@ -206,10 +206,10 @@ module Fog
             response = @connection.request(params.merge({
               :headers  => {
                 'Content-Type' => 'application/json',
-                'X-Auth-Token' => @auth_token
+                'X-Auth-Token' => auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}",
+              :host     => endpoint_uri.host,
+              :path     => "#{endpoint_uri.path}/#{params[:path]}",
               :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
             }))
           rescue Excon::Errors::Unauthorized => error
@@ -234,28 +234,53 @@ module Fog
           response
         end
 
-        private
 
-        def authenticate
-          if @rackspace_must_reauthenticate || @rackspace_auth_token.nil?
-            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']
-            uri = URI.parse(credentials['X-Server-Management-Url'])
-          else
-            @auth_token = @rackspace_auth_token
-            uri = URI.parse(@rackspace_management_url)
-          end
-          @host   = @rackspace_servicenet == true ? "snet-#{uri.host}" : uri.host
-          @path   = uri.path
-          @port   = uri.port
-          @scheme = uri.scheme
+        def service_net?
+           @rackspace_servicenet == true
         end
 
+         def authenticate
+           if @rackspace_must_reauthenticate || @rackspace_auth_token.nil?
+             options = {
+               :rackspace_api_key  => @rackspace_api_key,
+               :rackspace_username => @rackspace_username,
+               :rackspace_auth_url => @rackspace_auth_url
+             }
+             super(options)
+           else
+             @auth_token = @rackspace_auth_token
+             @uri = URI.parse(@rackspace_endpoint)
+           end
+         end
+
+         def service_name
+           :cloudServers
+         end
+
+         def region
+           @rackspace_region
+         end
+
+         def endpoint_uri(service_endpoint_url=nil)
+           return @uri if @uri
+
+           @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_v1_url)
+           @uri.host = "snet-#{@uri.host}" if service_net?
+           @uri
+         end
+
+         private
+
+         def deprecation_warnings(options)
+           Fog::Logger.deprecation("The :rackspace_management_url option is deprecated. Please use :rackspace_compute_v1_url for custom endpoints") if options[:rackspace_management_url]
+         end
+
+         def authenticate_v1(options)
+           credentials = Fog::Rackspace.authenticate(options, @connection_options)
+           endpoint_uri credentials['X-Server-Management-Url']
+           @auth_token = credentials['X-Auth-Token']
+         end
+
       end
     end
   end

data/lib/fog/rackspace/compute_v2.rb

@@ -8,6 +8,29 @@ module Fog
       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 '#{state}'"
+        end
+      end
+
+      class InvalidImageStateException < InvalidStateException
+         def to_s
+           "Image should have transitioned to '#{desired_state}' not '#{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 +39,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
@@ -69,8 +94,8 @@ module Fog
       request :create_network
       request :delete_network
 
-      class Mock
-        include Fog::Rackspace::MockData
+      class Mock < Fog::Rackspace::Service
+        include Fog::Rackspace::MockData      
 
         def initialize(options)
           @rackspace_api_key = options[:rackspace_api_key]
@@ -93,26 +118,22 @@ module Fog
         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)
-
-          @host = uri.host
-          @persistent = options[:persistent] || false
-          @path = uri.path
-          @port = uri.port
-          @scheme = uri.scheme
-
           authenticate
 
-          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+          deprecation_warnings(options)
+          
+          @persistent = options[:persistent] || false
+          @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
         end
 
         def request(params)
@@ -121,10 +142,10 @@ module Fog
               :headers  => {
                 'Content-Type' => 'application/json',
                 'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
+                'X-Auth-Token' => auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}"
+              :host     => endpoint_uri.host,
+              :path     => "#{endpoint_uri.path}/#{params[:path]}"
             }))
           rescue Excon::Errors::NotFound => error
             raise NotFound.slurp error
@@ -145,19 +166,75 @@ module Fog
           end
           response
         end
-
-        private
-
+        
         def authenticate
           options = {
-            :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_api_key => @rackspace_api_key,
             :rackspace_username => @rackspace_username,
             :rackspace_auth_url => @rackspace_auth_url
           }
+          super(options)
+        end
+
+        def service_name
+          :cloudServersOpenStack
+        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
+        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
+        end
+
+        def append_tenant_v1(credentials)
+          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
+          
+          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

@@ -16,6 +16,9 @@ module Fog
       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,32 +52,36 @@ 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] || {}
-
-          endpoint = options[:rackspace_endpoint] || DFW_ENDPOINT
-          uri = URI.parse(endpoint)
-
-          @host = uri.host
-          @persistent = options[:persistent] || false
-          @path = uri.path
-          @port = uri.port
-          @scheme = uri.scheme
+          setup_custom_endpoint(options)
 
           authenticate
 
-          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+          deprecation_warnings(options)
+
+          @persistent = options[:persistent] || false
+          @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
         end
 
         def request(params)
@@ -83,10 +90,10 @@ module Fog
               :headers  => {
                 'Content-Type' => 'application/json',
                 'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
+                'X-Auth-Token' => auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @host,
-              :path     => "#{@path}/#{params[:path]}"
+              :host     => endpoint_uri.host,
+              :path     => "#{endpoint_uri.path}/#{params[:path]}"
             }))
           rescue Excon::Errors::NotFound => error
             raise NotFound.slurp error
@@ -103,7 +110,9 @@ module Fog
           response
         end
 
-        private
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_database_url)
+        end
 
         def authenticate
           options = {
@@ -111,10 +120,57 @@ module Fog
             :rackspace_username => @rackspace_username,
             :rackspace_auth_url => @rackspace_auth_url
           }
+
+          super(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
+        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
+        end
+
+        def append_tenant_v1(credentials)
+          account_id = credentials['X-Server-Management-Url'].match(/.*\/([\d]+)$/)[1]
+
+          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

@@ -18,7 +18,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 +43,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,22 +71,38 @@ 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 })
+          @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
@@ -95,7 +111,7 @@ module Fog
           #TODO - Unify code with other rackspace services
           begin
             response = @connection.request(params.merge!({
-              :path     => "#{@path}/#{params[:path]}"
+              :path     => "#{endpoint_uri.path}/#{params[:path]}"
             }))
           rescue Excon::Errors::BadRequest => error
             raise Fog::Rackspace::Errors::BadRequest.slurp error
@@ -112,18 +128,6 @@ module Fog
           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('&')
         end
@@ -133,6 +137,35 @@ 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 = {
+            :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_username => @rackspace_username,
+            :rackspace_auth_url => @rackspace_auth_url
+          }
+
+          super(options)
+        end
       end
     end
   end