diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index b009ed50eb..4ea16b95d9 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -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'] diff --git a/market/sunstone/etc/sunstone-appmarket.conf b/market/sunstone/etc/sunstone-appmarket.conf index 7e31aa2db3..6a5a3b1086 100644 --- a/market/sunstone/etc/sunstone-appmarket.conf +++ b/market/sunstone/etc/sunstone-appmarket.conf @@ -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 \ No newline at end of file +:appmarket_url: https://localhost:6242 \ No newline at end of file diff --git a/market/sunstone/routes/appmarket.rb b/market/sunstone/routes/appmarket.rb index 73fdde48b6..e725f4071c 100644 --- a/market/sunstone/routes/appmarket.rb +++ b/market/sunstone/routes/appmarket.rb @@ -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