You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/08/24 11:49:46 UTC
[2/9] git commit: GoGrid: Updated supported API to 1.9 in client
GoGrid: Updated supported API to 1.9 in client
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/940fba42
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/940fba42
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/940fba42
Branch: refs/heads/master
Commit: 940fba4297de8bbf30ce5ee8bc64cdd8c7c27ead
Parents: 3563f0e
Author: Michal Fojtik <mf...@redhat.com>
Authored: Thu Aug 23 14:17:40 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Fri Aug 24 11:50:15 2012 +0200
----------------------------------------------------------------------
.../lib/deltacloud/drivers/gogrid/gogrid_client.rb | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/940fba42/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb b/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb
index 76b326e..77fba97 100644
--- a/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb
+++ b/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb
@@ -17,6 +17,7 @@
require 'digest/md5'
require 'cgi'
require 'open-uri'
+require 'json'
module Kernel
def suppress_warnings
@@ -44,7 +45,7 @@ class GoGridClient
apikey='YOUR API KEY',
secret='YOUR SHARED SECRET',
format='json',
- version='1.6')
+ version='1.9')
@server = server
@secret = secret
@default_params = {'format'=>format, 'v'=>version,'api_key' => apikey}
@@ -52,13 +53,13 @@ class GoGridClient
def getRequestURL(method,params)
requestURL = @server+'/'+method+'?'
- call_params = @default_params.merge(params)
- call_params['sig']=getSignature(@default_params['api_key'],@secret)
- requestURL = requestURL+encode_params(call_params)
+ call_params = @default_params.merge(params)
+ call_params['sig']=getSignature(@default_params['api_key'],@secret)
+ requestURL = requestURL+encode_params(call_params)
end
def getSignature(key,secret)
- Digest::MD5.hexdigest(key+secret+"%.0f"%Time.new.to_f)
+ Digest::MD5.hexdigest(key+secret+"%.0f"%Time.now.to_f)
end
def sendAPIRequest(method,params={})
@@ -71,8 +72,8 @@ class GoGridClient
if version
@default_params['v'] = version
else
- @default_params['v'] = '1.5'
- end
+ @default_params['v'] = '1.9'
+ end
request = sendAPIRequest(method, params)
JSON::parse(request)
end