shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-22 22:03:39 +03:00
Code Releases Wiki Activity

OCCI Client lib now works with new CloudClient

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@883 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Rubén S. Montero 2009-10-22 23:47:42 +00:00
parent f6c31a5049
commit 04171ed4dc
4 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cloud/occi/bin/occi-compute
View File

@ -84,7 +84,7 @@ require 'getoptlong'
require 'rdoc/usage'
require 'pp'
include CloudClient::CLIHelpers
include CloudCLI
opts = GetoptLong.new(
['--help', '-h',GetoptLong::NO_ARGUMENT],

3
src/cloud/occi/bin/occi-network
View File

@ -79,11 +79,12 @@ $: << RUBY_LIB_LOCATION
$: << RUBY_LIB_LOCATION+"/cloud"
require 'occi/OCCIClient'
require 'CloudClient'
require 'getoptlong'
require 'rdoc/usage'
require 'pp'
include CloudClient::CLIHelpers
include CloudCLI
opts = GetoptLong.new(
['--help', '-h',GetoptLong::NO_ARGUMENT],

3
src/cloud/occi/bin/occi-storage
View File

@ -77,11 +77,12 @@ $: << RUBY_LIB_LOCATION
$: << RUBY_LIB_LOCATION+"/cloud"
require 'occi/OCCIClient'
require 'CloudClient'
require 'getoptlong'
require 'rdoc/usage'
require 'pp'
include CloudClient::CLIHelpers
include CloudCLI
opts = GetoptLong.new(
['--help', '-h',GetoptLong::NO_ARGUMENT],

50
src/cloud/occi/lib/OCCIClient.rb
View File

@ -28,8 +28,9 @@ module OCCIClient
#####################################################################
# Client Library to interface with the OpenNebula OCCI Service
#####################################################################
class Client < CloudClient
class Client
include CloudClient
######################################################################
# Initialize client library
######################################################################
@ -49,7 +50,7 @@ module OCCIClient
if user && pass
@occiauth = [user, pass]
else
@occiauth = get_one_auth
@occiauth = CloudClient::get_one_auth
end
if !@occiauth
@ -59,25 +60,6 @@ module OCCIClient
@occiauth[1] = Digest::SHA1.hexdigest(@occiauth[1])
end
# Starts an http connection and calls the block provided. SSL flag
# is set if needed.
def http_start(url, &block)
http = Net::HTTP.new(url.host, url.port)
if url.scheme=='https'
http.use_ssl = true
http.verify_mode=OpenSSL::SSL::VERIFY_NONE
end
begin
http.start do |connection|
block.call(connection)
end
rescue Errno::ECONNREFUSED => e
puts "Error connecting to server (" + e.to_s + ")."
exit -1
end
end
#################################
# Pool Resource Request Methods #
#################################
@ -97,7 +79,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) do |http|
res = CloudClient::http_start(url) do |http|
http.request(req)
end
@ -113,7 +95,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) {|http|
res = CloudClient::http_start(url) {|http|
http.request(req)
}
puts res.body
@ -133,7 +115,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) do |http|
res = CloudClient::http_start(url) do |http|
http.request(req)
end
@ -149,7 +131,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) {|http|
res = CloudClient::http_start(url) {|http|
http.request(req)
}
puts res.body
@ -203,7 +185,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) do |http|
res = CloudClient::http_start(url) do |http|
http.request(req)
end
file.close
@ -221,7 +203,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) {|http|
res = CloudClient::http_start(url) {|http|
http.request(req)
}
puts res.body
@ -240,7 +222,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) {|http|
res = CloudClient::http_start(url) {|http|
http.request(req)
}
puts res.body
@ -261,7 +243,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) do |http|
res = CloudClient::http_start(url) do |http|
http.request(req)
end
@ -277,7 +259,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) {|http|
res = CloudClient::http_start(url) {|http|
http.request(req)
}
end
@ -292,7 +274,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) {|http|
res = CloudClient::http_start(url) {|http|
http.request(req)
}
puts res.body
@ -307,7 +289,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) {|http|
res = CloudClient::http_start(url) {|http|
http.request(req)
}
end
@ -322,7 +304,7 @@ module OCCIClient
req.basic_auth @occiauth[0], @occiauth[1]
res = http_start(url) {|http|
res = CloudClient::http_start(url) {|http|
http.request(req)
}
puts res.body