lib/fog/glesys/compute.rb in fog-maestrodev-1.19.0.20140212012611 vs lib/fog/glesys/compute.rb in fog-maestrodev-1.20.0.20140305101305
- old
+ new
@@ -1,5 +1,7 @@
+require 'fog/glesys/core'
+
module Fog
module Compute
class Glesys < Fog::Service
requires :glesys_username, :glesys_api_key
@@ -78,11 +80,11 @@
@connection_options = options[:connection_options] || {}
@persistent = options[:persistent] || false
@connection = Fog::Connection.new(@api_url, @persistent, @connection_options)
end
- def request(method_name, options = {})
+ def request(method_name, options = {})
options.merge!( {:format => 'json'})
begin
parser = options.delete(:parser)
@@ -110,12 +112,12 @@
raise case error
when Excon::Errors::NotFound
Fog::Compute::Glesys::NotFound.slurp(error)
else
error
- end
- end
- end
+ end
+ end
+ end
private
def encoded_api_auth
token = [@glesys_username, @glesys_api_key].join(':')