fog 1.34.0 → 1.35.0

data/lib/fog/digitalocean/requests/compute_v2/upgrade.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class Real
+        def upgrade(id)
+          body = { :type => "upgrade" }
+
+          encoded_body = Fog::JSON.encode(body)
+
+          request(
+            :expects => [201],
+            :headers => {
+              'Content-Type' => "application/json; charset=UTF-8",
+            },
+            :method  => 'POST',
+            :path    => "v2/droplets/#{id}/actions",
+            :body    => encoded_body,
+          )
+        end
+      end
+
+      class Mock
+        def upgrade(id)
+          response         = Excon::Response.new
+          response.status  = 201
+          response.body    = {
+            'action' => {
+              'id'            => Fog::Mock.random_numbers(1).to_i,
+              'status'        => "in-progress",
+              'type'          => "upgrade",
+              'started_at'    => "2014-11-14T16:31:00Z",
+              'completed_at'  => null,
+              'resource_id'   => id,
+              'resource_type' => "droplet",
+              'region'        => "nyc3",
+              'region_slug'   => "nyc3"
+            }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/service.rb

@@ -0,0 +1,51 @@
+module Fog
+  module DigitalOcean
+    class Service
+
+      def request(params, parse_json = true)
+        first_attempt = true
+        begin
+          response = @connection.request(request_params(params))
+        rescue Excon::Errors::Unauthorized => error
+          raise error unless first_attempt
+          first_attempt = false
+          authenticate
+          retry
+        end
+
+        process_response(response) if parse_json
+        response
+      end
+
+      private
+
+      def process_response(response)
+        if response &&
+          response.body &&
+          response.body.is_a?(String) &&
+          !response.body.strip.empty?
+          begin
+            response.body = Fog::JSON.decode(response.body)
+          rescue Fog::JSON::DecodeError => e
+            Fog::Logger.warning("Error Parsing response json - #{e}")
+            response.body = {}
+          end
+        end
+      end
+
+      def headers(options={})
+        {'Content-Type' => 'application/json',
+         'Accept'       => 'application/json',
+        }.merge(options[:headers] || {})
+      end
+
+      def request_params(params)
+        params.merge({
+                       :headers => headers(params),
+                       :path    => "#{params[:path]}"
+                     })
+      end
+
+    end
+  end
+end

data/lib/fog/linode/models/compute/kernels.rb

@@ -12,7 +12,7 @@ module Fog
         end
 
         def get(id)
-          new kernels(id).first
+          new kernels(id).select {|kernel| kernel[:id] == id }.first
         rescue Fog::Compute::Linode::NotFound
           nil
         end

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

@@ -48,24 +48,24 @@ module Fog
           return "CPU=#{vcpu.to_f/10}\n" unless cpu
           return "CPU=#{vcpu}\n" if cpu.to_i > vcpu.to_i
           "CPU=#{cpu}\n"
-        end  
+        end
 
         def get_vcpu
           self.vcpu = 1 unless vcpu
           "VCPU=#{vcpu}\n"
-        end  
+        end
 
         def get_memory
           self.memory = 128 unless memory
           "MEMORY=#{memory}\n"
-        end  
+        end
 
         def get_raw
           return "" unless raw
           ret = "RAW=#{raw}\n"
           ret.gsub!(/\{/, '[')
           ret.gsub!(/\}/, ']')
-          ret.gsub!(/>/,'')
+          ret.gsub!(/=>/,'=')
           ret
         end
 
@@ -82,7 +82,7 @@ module Fog
           ret.gsub!(/\{/, '[')
           ret.gsub!(/\}/, ']')
           ret.gsub!(/>/,'')
-          ret 
+          ret
         end
 
         def get_os
@@ -91,16 +91,16 @@ module Fog
           ret.gsub!(/\{/, '[')
           ret.gsub!(/\}/, ']')
           ret.gsub!(/>/,'')
-          ret 
+          ret
         end
 
         def get_graphics
-          return "" unless graphics 
+          return "" unless graphics
           ret = "GRAPHICS=#{graphics}\n"
           ret.gsub!(/\{/, '[')
           ret.gsub!(/\}/, ']')
           ret.gsub!(/>/,'')
-          ret 
+          ret
         end
 
         def get_nic
@@ -115,26 +115,26 @@ module Fog
           #ret.gsub!(/\{/, '[')
           #ret.gsub!(/\}/, ']')
           #ret.gsub!(/>/,'')
-          ret 
+          ret
         end
 
         def get_sched_ds_requirements
-          return "" unless sched_ds_requirements 
+          return "" unless sched_ds_requirements
           %Q|SCHED_DS_REQUIREMENTS="#{sched_ds_requirements.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_ds_rank
-          return "" unless sched_ds_rank 
+          return "" unless sched_ds_rank
           %Q|SCHED_DS_RANK="#{sched_ds_rank.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_requirements
-          return "" unless sched_requirements 
+          return "" unless sched_requirements
           %Q|SCHED_REQUIREMENTS="#{sched_requirements.gsub(/"/){ %q(\") }}"\n|
         end
 
         def get_sched_rank
-          return "" unless sched_rank 
+          return "" unless sched_rank
           %Q|SCHED_RANK="#{sched_rank.gsub(/"/){ %q(\") }}"\n|
         end
 

data/lib/fog/opennebula/requests/compute/template_pool.rb

@@ -21,6 +21,9 @@
 # OS=[
 #     ARCH="x86_64",
 #     BOOT="network,hd" ]
+# RAW=[
+#   DATA="<cpu match='exact'><model fallback='allow'>core2duo</model></cpu>",
+#   TYPE="kvm" ]
 
 
 module Fog
@@ -37,7 +40,7 @@ module Fog
             templates.info!(-2, filter[:id], filter[:id])
           end # if filter[:id].nil?
 
-          templates = templates.map do |t| 
+          templates = templates.map do |t|
             # filtering by name
             # done here, because OpenNebula:TemplatePool does not support something like .delete_if
             if filter[:name] && filter[:name].is_a?(String) && !filter[:name].empty?
@@ -51,8 +54,8 @@ module Fog
             end
 
             h = Hash[
-              :id => t.to_hash["VMTEMPLATE"]["ID"], 
-              :name => t.to_hash["VMTEMPLATE"]["NAME"], 
+              :id => t.to_hash["VMTEMPLATE"]["ID"],
+              :name => t.to_hash["VMTEMPLATE"]["NAME"],
               :content => t.template_str,
               :USER_VARIABLES => "" # Default if not set in template
             ]
@@ -67,7 +70,7 @@ module Fog
                   vnet = networks.get(n["NETWORK_ID"].to_s)
                 elsif n["NETWORK"]
                   vnet = networks.get_by_name(n["NETWORK"].to_s)
-                else 
+                else
                   next
                 end
                 h["NIC"] << interfaces.new({ :vnet => vnet, :model => n["MODEL"] || "virtio" })
@@ -87,15 +90,15 @@ module Fog
             else
               # should i break?
             end
-          
+
             # every key should be lowercase
             ret_hash = {}
-            h.each_pair do |k,v| 
-              ret_hash.merge!({k.downcase => v}) 
+            h.each_pair do |k,v|
+              ret_hash.merge!({k.downcase => v})
             end
             ret_hash
           end
-          
+
           templates.delete nil
           raise Fog::Compute::OpenNebula::NotFound, "Flavor/Template not found" if templates.empty?
           templates
@@ -107,7 +110,7 @@ module Fog
           nic1 = Mock_nic.new
           nic1.vnet = networks.first
 
-          [ 
+          [
             {
               :content => %Q{
                 NAME = mock-vm
@@ -131,14 +134,14 @@ module Fog
                 'ARCH' => 'x86_64'
               },
               :graphics => {},
-              :raw => {},
+              :raw => %|["DATA"=>"<cpu match='exact'><model fallback='allow'>core2duo</model></cpu>", "TYPE"=>"kvm"]|,
               :context => {},
               :user_variables => {}
             }
           ]
         end
 
-        class Mock_nic 
+        class Mock_nic
           attr_accessor :vnet
 
           def id

data/lib/fog/openstack.rb

@@ -2,6 +2,8 @@ require 'fog/openstack/compute'
 require 'fog/openstack/identity_v2'
 require 'fog/openstack/identity_v3'
 require 'fog/openstack/image'
+require 'fog/openstack/image_v1'
+require 'fog/openstack/image_v2'
 require 'fog/openstack/metering'
 require 'fog/openstack/network'
 require 'fog/openstack/orchestration'

data/lib/fog/openstack/core.rb

@@ -297,7 +297,7 @@ module Fog
 
       token, body = retrieve_tokens_v3 options, connection_options
 
-      service = get_service_v3(body, service_type, service_name, openstack_region)
+      service = get_service_v3(body, service_type, service_name, openstack_region, options)
 
       options[:unscoped_token] = token
 
@@ -359,7 +359,7 @@ module Fog
         raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions.join(',')}'")
       end
 
-      identity_service = get_service_v3(body, identity_service_type, nil, nil, :endpoint_path_matches => /\/v3/) if identity_service_type
+      identity_service = get_service_v3(body, identity_service_type, nil, nil, :openstack_endpoint_path_matches => /\/v3/) if identity_service_type
 
       management_url = service['endpoints'].find { |e| e['interface']==endpoint_type }['url']
       identity_url = identity_service['endpoints'].find { |e| e['interface']=='public' }['url'] if identity_service
@@ -532,7 +532,7 @@ module Fog
 
       # Filter the found services by region (if specified) and whether the endpoint path matches the given regex (e.g. /\/v3/)
       services.find do |s|
-        s['endpoints'].any? { |ep| endpoint_region?(ep, region) && endpoint_path_match?(ep, options[:endpoint_path_matches])}
+        s['endpoints'].any? { |ep| endpoint_region?(ep, region) && endpoint_path_match?(ep, options[:openstack_endpoint_path_matches])}
       end if services
 
     end
@@ -572,6 +572,33 @@ module Fog
       version
     end
 
+    def self.get_supported_version_path(supported_versions, uri, auth_token, connection_options = {})
+      connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options)
+      response = connection.request({
+                                        :expects => [200, 204, 300],
+                                        :headers => {'Content-Type' => 'application/json',
+                                                     'Accept' => 'application/json',
+                                                     'X-Auth-Token' => auth_token},
+                                        :method => 'GET'
+                                    })
+
+      body = Fog::JSON.decode(response.body)
+      path = nil
+      unless body['versions'].empty?
+        supported_version = body['versions'].find do |x|
+          x["id"].match(supported_versions) &&
+              (x["status"] == "CURRENT" || x["status"] == "SUPPORTED")
+        end
+        path = URI.parse(supported_version['links'].first['href']).path if supported_version
+      end
+      if path.nil?
+        raise Fog::OpenStack::Errors::ServiceUnavailable.new(
+                  "OpenStack service only supports API versions #{supported_versions.inspect}")
+      end
+
+      path.chomp '/'
+    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/openstack/identity.rb

@@ -7,20 +7,21 @@ module Fog
       # Fog::Identity::OpenStack.new() will return a Fog::Identity::OpenStack::V2 or a Fog::Identity::OpenStack::V3,
       #  depending on whether the auth URL is for an OpenStack Identity V2 or V3 API endpoint
       def self.new(args = {})
+        @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url]
         if self.inspect == 'Fog::Identity::OpenStack'
-          if args[:openstack_auth_url]
-            @openstack_auth_uri = URI.parse(args[:openstack_auth_url])
-            if @openstack_auth_uri.path =~ /\/v3/
-              service = Fog::Identity::OpenStack::V3.new(args)
-            end
-          end
-          service ||= Fog::Identity::OpenStack::V2.new(args)
+          service = (is_v3? args) ? Fog::Identity::OpenStack::V3.new(args) : Fog::Identity::OpenStack::V2.new(args)
         else
           service = Fog::Service.new(args)
         end
         service
       end
 
+      private
+
+      def self.is_v3?(args)
+        @openstack_auth_uri && @openstack_auth_uri.path =~ /\/v3/
+      end
+
       module Common
         attr_reader :unscoped_token
 

data/lib/fog/openstack/identity_v3.rb

@@ -160,6 +160,7 @@ module Fog
 
             @openstack_endpoint_type  = options[:openstack_endpoint_type] || 'adminURL'
 
+            @openstack_endpoint_path_matches = options[:openstack_endpoint_path_matches] ||= /\/v3/
             authenticate
 
             @persistent = options[:persistent] || false

data/lib/fog/openstack/image.rb

@@ -3,154 +3,59 @@ require 'fog/openstack/core'
 module Fog
   module Image
     class OpenStack < Fog::Service
-      SUPPORTED_VERSIONS = /v1(\.(0|1))*/
 
-      requires :openstack_auth_url
-      recognizes :openstack_auth_token, :openstack_management_url,
-                 :persistent, :openstack_service_type, :openstack_service_name,
-                 :openstack_tenant, :openstack_tenant_id,
-                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
-                 :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type,
-                 :openstack_project_name, :openstack_project_id,
-                 :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
-                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
-
-      model_path 'fog/openstack/models/image'
-
-      model       :image
-      collection  :images
-
-      request_path 'fog/openstack/requests/image'
-
-      request :list_public_images
-      request :list_public_images_detailed
-      request :get_image
-      request :create_image
-      request :update_image
-      request :get_image_members
-      request :update_image_members
-      request :get_shared_images
-      request :add_member_to_image
-      request :remove_member_from_image
-      request :delete_image
-      request :get_image_by_id
-      request :set_tenant
-
-      class Mock
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              :images => {}
-            }
-          end
-        end
-
-        def self.reset
-          @data = nil
-        end
-
-        def initialize(options={})
-          @openstack_username = options[:openstack_username]
-          @openstack_tenant   = options[:openstack_tenant]
-          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-
-          @auth_token = Fog::Mock.random_base64(64)
-          @auth_token_expiration = (Time.now.utc + 86400).iso8601
-
-          management_url = URI.parse(options[:openstack_auth_url])
-          management_url.port = 9292
-          management_url.path = '/v1'
-          @openstack_management_url = management_url.to_s
-
-          @data ||= { :users => {} }
-          unless @data[:users].find {|u| u['name'] == options[:openstack_username]}
-            id = Fog::Mock.random_numbers(6).to_s
-            @data[:users][id] = {
-              'id'       => id,
-              'name'     => options[:openstack_username],
-              'email'    => "#{options[:openstack_username]}@mock.com",
-              'tenantId' => Fog::Mock.random_numbers(6).to_s,
-              'enabled'  => true
-            }
-          end
-        end
-
-        def data
-          self.class.data[@openstack_username]
-        end
-
-        def reset_data
-          self.class.data.delete(@openstack_username)
-        end
-
-        def credentials
-          { :provider                 => 'openstack',
-            :openstack_auth_url       => @openstack_auth_uri.to_s,
-            :openstack_auth_token     => @auth_token,
-            :openstack_region         => @openstack_region,
-            :openstack_management_url => @openstack_management_url }
-        end
+      # Fog::Image::OpenStack.new() will return a Fog::Image::OpenStack::V2 or a Fog::Image::OpenStack::V3,
+      #  choosing the latest available
+      def self.new(args = {})
+        @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url]
+        if self.inspect == 'Fog::Image::OpenStack'
+          service = Fog::Image::OpenStack::V2.new(args) unless args.empty?
+          service ||= Fog::Image::OpenStack::V1.new(args)
+        else
+          service = Fog::Service.new(args)
+        end
+        service
       end
 
-      class Real
-        include Fog::OpenStack::Core
-
-        def initialize(options={})
-          initialize_identity options
-
-          @openstack_service_type           = options[:openstack_service_type] || ['image']
-          @openstack_service_name           = options[:openstack_service_name]
-          @openstack_endpoint_type          = options[:openstack_endpoint_type] || 'adminURL'
-
-          @connection_options               = options[:connection_options] || {}
-
-          authenticate
-
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
-                                                               @openstack_management_uri,
-                                                               @auth_token,
-                                                               @connection_options)
-          end
+      module Common
+        attr_reader :unscoped_token
 
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
+        include Fog::OpenStack::Core
 
         def request(params)
+          retried = false
           begin
-            response = @connection.request(params.merge({
-              :headers  => {
+            std_headers = {
                 'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
                 'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :path     => "#{@path}/#{params[:path]}"#,
+            }
+            param_headers = params.fetch(:headers,{})
+
+            response = @connection.request(params.merge({
+              :headers => std_headers.merge(param_headers),
+              :path => "#{@path}/#{params[:path]}"
             }))
           rescue Excon::Errors::Unauthorized => error
-            if error.response.body != 'Bad username or password' # token expiration
-              @openstack_must_reauthenticate = true
-              authenticate
-              retry
-            else # bad credentials
-              raise error
-            end
+            raise if retried
+            retried = true
+
+            @openstack_must_reauthenticate = true
+            authenticate
+            retry
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
-            when Excon::Errors::NotFound
-              Fog::Compute::OpenStack::NotFound.slurp(error)
-            else
-              error
-            end
+                    when Excon::Errors::NotFound
+                      Fog::Image::OpenStack::NotFound.slurp(error)
+                    else
+                      error
+                  end
           end
           unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+            response.body = Fog::JSON.decode(response.body) unless params[:raw_body]
           end
           response
         end
-
-        private
-
       end
     end
   end