appmarket: Change default endpoint for sunstone-appmarket

This commit is contained in:
Daniel Molina committed 2012-09-21 13:15:07 +02:00
1 parent 1ea2ff5570
commit 76550807d4
3 files changed
+8 -24

No files matched your search

+2 -18
View File
@@ -121,7 +121,7 @@ get '/service' do
end
status 200
#body Parser.render(service_pool)
body service_pool.to_json
end
@@ -135,7 +135,7 @@ get '/service/:id' do
end
status 200
#body Parser.render(service)
body service.to_json
end
@@ -246,7 +246,6 @@ get '/service_template' do
status 200
#body Parser.render(s_template_pool)
body s_template_pool.to_json
end
@@ -260,7 +259,6 @@ get '/service_template/:id' do
status 200
#body Parser.render(rc)
body service_template.to_json
end
@@ -273,22 +271,9 @@ delete '/service_template/:id' do
end
status 201
#body Parser.render(rc)
#body service_template.to_json
end
post '/service_template' do
#template = Parser.json_to_hash(request.body.read)
#begin
# Validator.validate(template)
#rescue
# error 403,
#end
#template_xml = Parser.hash_to_xml(template)
s_template = OpenNebula::ServiceTemplate.new(
OpenNebula::ServiceTemplate.build_xml,
@client)
@@ -332,7 +317,6 @@ post '/service_template/:id/action' do
service.info
#body Parser.render(rc)
body service.to_json
when 'chown'
if opts && opts['uid']
+3 -3
View File
@@ -5,9 +5,9 @@
# AppMarket username and password
# If no credentials are provided, an anonymous client will be used
#
#:marketplace_username:
#:marketplace_password:
#:appmarket_username:
#:appmarket_password:
# AppMarket endpoint
#
:marketplace_url: https://marketplace.c12g.com/appliance
:appmarket_url: https://localhost:6242
+3 -3
View File
@@ -16,9 +16,9 @@ set :appmarket_config, appmarket_conf
helpers do
def am_build_client
Market::ApplianceClient.new(
settings.appmarket_config[:marketplace_username],
settings.appmarket_config[:marketplace_password],
settings.appmarket_config[:marketplace_url],
settings.appmarket_config[:appmarket_username],
settings.appmarket_config[:appmarket_password],
settings.appmarket_config[:appmarket_url],
"Sunstone")
end