fog 1.10.0 → 1.10.1

data/lib/fog/ovirt/compute.rb

@@ -16,6 +16,8 @@ module Fog
       collection :interfaces
       model      :volume
       collection :volumes
+      model      :quota
+      collection :quotas
 
       request_path 'fog/ovirt/requests/compute'
 
@@ -43,6 +45,8 @@ module Fog
       request :add_volume
       request :destroy_volume
       request :get_api_version
+      request :list_quotas
+      request :get_quota
 
       module Shared
         # converts an OVIRT object into an hash for fog to consume.

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

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Ovirt
+
+      class Quota < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :description
+
+        def to_s
+          name
+        end
+
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,24 @@
+require 'fog/core/collection'
+require 'fog/ovirt/models/compute/quota'
+
+module Fog
+  module Compute
+    class Ovirt
+
+      class Quotas < Fog::Collection
+
+        model Fog::Compute::Ovirt::Quota
+
+	def all(filters = {})
+          load service.list_quotas(filters)
+        end
+
+        def get(id)
+          new service.get_quota(id)
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -27,7 +27,8 @@ module Fog
         attribute :interfaces
         attribute :volumes
         attribute :raw
-
+        attribute :quota
+ 
         def ready?
           !(status =~ /down/i)
         end

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

@@ -16,6 +16,7 @@ module Fog
         attribute :sparse
         attribute :size_gb
         attribute :status
+        attribute :quota
 
         def size_gb
           attributes[:size_gb] ||= attributes[:size].to_i / DISK_SIZE_TO_GB if attributes[:size]

data/lib/fog/ovirt/requests/compute/get_quota.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Ovirt
+      class Real
+        def get_quota(id)
+          ovirt_attrs client.quota(id)
+        end
+
+      end
+      class Mock
+        def get_quota(id)
+          xml = read_xml('quota.xml')
+          ovirt_attrs OVIRT::Quota::new(self, Nokogiri::XML(xml).root)
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/ovirt/requests/compute/list_quotas.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Ovirt
+      class Real
+        def list_quotas(filters = {})
+          client.quotas(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj}
+        end
+
+      end
+      class Mock
+        def list_quotas(filters = {})
+          xml = read_xml 'quotas.xml'
+          Nokogiri::XML(xml).xpath('/quotas/quota').collect do |q|
+            ovirt_attrs OVIRT::Quotas::new(self, q)
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/ovirt/requests/compute/mock_files/quotas.xml

@@ -0,0 +1,7 @@
+<quotas>
+  <quota href="/api/datacenters/c0645886-4b4b-11e1-a0ae-5254009970cc/quotas/aae6e3f3-0798-4ef7-b4e4-c036f04a98d7" id="aae6e3f3-0798-4ef7-b4e4-c036f04a98d7">
+    <name>DefaultQuota-Datacenter1</name>
+    <description>Automatic generated Quota for Data Center Datacenter1</description>
+    <data_center href="/api/datacenters/c0645886-4b4b-11e1-a0ae-5254009970cc" id="c0645886-4b4b-11e1-a0ae-5254009970cc"/>
+  </quota>
+</quotas>

data/lib/fog/rackspace.rb

@@ -1,10 +1,14 @@
 require 'fog/core'
 require 'fog/rackspace/mock_data'
+require 'fog/rackspace/service'
 
 module Fog
   module Rackspace
     extend Fog::Provider
 
+    US_AUTH_ENDPOINT = 'https://identity.api.rackspacecloud.com/v2.0' unless defined? US_AUTH_ENDPOINT
+    UK_AUTH_ENDPOINT = 'https://lon.identity.api.rackspacecloud.com/v2.0' unless defined? UK_AUTH_ENDPOINT
+
     module Errors
       class ServiceError < Fog::Errors::Error
         attr_reader :response_data, :status_code
@@ -86,6 +90,13 @@ module Fog
       end
     end
 
+    def self.normalize_url(endpoint)
+      return nil unless endpoint
+      str = endpoint.chomp " "
+      str = str.chomp "/"
+      str.downcase
+    end
+
     # CGI.escape, but without special treatment on spaces
     def self.escape(str,extra_exclude_chars = '')
       str.gsub(/([^a-zA-Z0-9_.-#{extra_exclude_chars}]+)/) do

data/lib/fog/rackspace/block_storage.rb

@@ -16,6 +16,8 @@ module Fog
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url
       recognizes :rackspace_endpoint
+      recognizes :rackspace_region
+      recognizes :rackspace_block_storage_url
 
       model_path 'fog/rackspace/models/block_storage'
       model :volume
@@ -43,7 +45,7 @@ module Fog
       request :get_snapshot
       request :list_snapshots
 
-      class Mock
+      class Mock < Fog::Rackspace::Service
         include Fog::Rackspace::MockData
 
         def initialize(options = {})
@@ -67,26 +69,21 @@ 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]
           @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)
@@ -95,10 +92,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
@@ -115,19 +112,75 @@ module Fog
           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
+          :cloudBlockStorage
+        end
+
+        def region
+          @rackspace_region
+        end
+
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_block_storage_url)
+        end
+
+        private
+
+        def setup_custom_endpoint(options)
+          @rackspace_endpoint = Fog::Rackspace.normalize_url(options[:rackspace_block_storage_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
+              @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_block_storage_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
   end

data/lib/fog/rackspace/cdn.rb

@@ -6,7 +6,7 @@ module Fog
     class Rackspace < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url, :persistent, :rackspace_cdn_ssl
+      recognizes :rackspace_auth_url, :persistent, :rackspace_cdn_ssl, :rackspace_region, :rackspace_cdn_url
 
       request_path 'fog/rackspace/requests/cdn'
       request :get_containers
@@ -24,6 +24,26 @@ module Fog
           "X-Cdn-Ssl-Uri" => :ssl_uri
         }.freeze
 
+        def service_name
+          :cloudFilesCDN
+        end
+
+        def region
+          @rackspace_region
+        end
+
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_cdn_url || service_endpoint_url, :rackspace_cdn_url)
+        end
+
+        # Publish container to CDN
+        # @param [Fog::Storage::Rackspace::Directory] directory to publish
+        # @param [Boolean] publish If true directory is published. If false directory is unpublished.
+        # @return [Hash] hash containing urls for published container
+        # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404
+        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Errors::ServiceError]
         def publish_container(container, publish = true)
           enabled = publish ? 'True' : 'False'
           response = put_container(container.key, 'X-Cdn-Enabled' => enabled)
@@ -31,6 +51,13 @@ module Fog
           urls_from_headers(response.headers)
         end
         
+        # Returns hash of urls for container
+        # @param [Fog::Storage::Rackspace::Directory] container to retrieve urls for
+        # @return [Hash] hash containing urls for published container
+        # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400
+        # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500
+        # @raise [Fog::Rackspace::Errors::ServiceError]
+        # @note If unable to find container or container is not published this method will return an empty hash.
         def urls(container)
           begin 
             response = head_container(container.key)
@@ -53,9 +80,9 @@ module Fog
         end        
       end
 
-      class Mock
+      class Mock < Fog::Rackspace::Service
         include Base
-        
+
         def self.data
           @data ||= Hash.new do |hash, key|
             hash[key] = {}
@@ -85,38 +112,41 @@ module Fog
         
       end
 
-      class Real
+      class Real < Fog::Rackspace::Service
         include Base
-        
+
         def initialize(options={})
           @connection_options = options[:connection_options] || {}
-          credentials = Fog::Rackspace.authenticate(options, @connection_options)
-          @auth_token = credentials['X-Auth-Token']
+          @rackspace_auth_url = options[:rackspace_auth_url]
+          @rackspace_cdn_url = options[:rackspace_cdn_url]
+          @rackspace_region = options[:rackspace_region] || :dfw
+          authenticate(options)
           @enabled = false
           @persistent = options[:persistent] || false
 
-          if credentials['X-CDN-Management-Url']
-            uri = URI.parse(credentials['X-CDN-Management-Url'])
-            @host   = uri.host
-            @path   = uri.path
-            @port   = uri.port
-            @scheme = uri.scheme
-            @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          if endpoint_uri
+            @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
             @enabled = true
           end
         end
-        
+
+        # Returns true if CDN service is enabled
+        # @return [Boolean]
         def enabled?
           @enabled
         end
 
+        # Resets CDN connection
         def reload
           @cdn_connection.reset
         end
         
+        # Purges File
+        # @param [Fog::Storage::Rackspace::File] file to be purged from the CDN
+        # @raise [Fog::Errors::NotImplemented] returned when non file parameters are specified
         def purge(file)
           unless file.is_a? Fog::Storage::Rackspace::File
-            raise Fog::Errors::NotImplemented.new("#{object.class} does not support CDN purging")
+            raise Fog::Errors::NotImplemented.new("#{object.class} does not support CDN purging")  if object
           end
           
           delete_object file.directory.key, file.key
@@ -129,10 +159,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::HTTPStatusError => error
             raise case error
@@ -147,6 +177,14 @@ module Fog
           end
           response
         end
+        
+        private 
+      
+        def authenticate_v1(options)
+          credentials = Fog::Rackspace.authenticate(options, @connection_options)
+          endpoint_uri credentials['X-CDN-Management-Url']
+          @auth_token = credentials['X-Auth-Token']
+        end
 
       end
     end