From 27f1f30b91c79dd9e8aa36acecc880379bb2610a Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 22 May 2013 18:31:35 +0200 Subject: [PATCH] appstage: Fix appstage client --- stage/bin/appstage | 7 ++++++- stage/cli/appstage_helper.rb | 8 ++++++-- stage/sunstone/routes/appstage.rb | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/stage/bin/appstage b/stage/bin/appstage index e2ac55efe7..8a1759f0e3 100755 --- a/stage/bin/appstage +++ b/stage/bin/appstage @@ -99,12 +99,17 @@ COOKBOOKS={ cmd = CommandParser::CmdParser.new(ARGV) do usage "`appstage` [] []" version OneApps::VERSION_TEXT - + set :option, CommandParser::VERSION helper = AppStageHelper.new template_helper = OneTemplateHelper.new + before_proc do + helper.set_client(options) + template_helper.set_client(options) + end + set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg| OpenNebulaHelper.rname_to_id(arg, "GROUP") end diff --git a/stage/cli/appstage_helper.rb b/stage/cli/appstage_helper.rb index bcbe79a287..e6a0f74608 100644 --- a/stage/cli/appstage_helper.rb +++ b/stage/cli/appstage_helper.rb @@ -40,7 +40,7 @@ private OpenNebula::ChefDocPool.new(@client, filter) end - def format_resource(node) + def format_resource(node, options={}) str_h1="%-80s" str="%-20s: %-20s" @@ -88,7 +88,11 @@ private CLIHelper.print_header(str_h1 % "NODE DEFINITION",false) - puts JSON.pretty_generate(node.node['node']) + begin + puts JSON.pretty_generate(node.node['node']) + rescue + puts "" + end puts diff --git a/stage/sunstone/routes/appstage.rb b/stage/sunstone/routes/appstage.rb index c83183d9af..7b5e8d85d9 100644 --- a/stage/sunstone/routes/appstage.rb +++ b/stage/sunstone/routes/appstage.rb @@ -34,7 +34,7 @@ helpers do def appstage_create(template) node = OpenNebula::ChefConf.new node.description = template['description'] if template['description'] - node.cookbooks = template['cookbooks'] if template['cookbacks'] + node.cookbooks = template['cookbooks'] if template['cookbooks'] node.templates = template['templates'] if template['templates'] #variables currently unused node.variables = template['variables'] if template['variables'] @@ -63,9 +63,10 @@ helpers do def appstage_update(resource, template) node = resource.node - node.node = template['node'] if template['node'] + node.node = template['node'] node.templates = template['templates'] node.cookbooks = template['cookbooks'] + node.description = template['description'] resource.update(node.to_json) end