feature #1303: Add onemarket command

This commit is contained in:
Daniel Molina committed 2012-06-13 15:22:06 +02:00
1 parent 3ad4956f6f
commit 0bec16e971
3 files changed
+171 -4

No files matched your search

+2 -2
View File
@@ -1128,9 +1128,9 @@ MARKET_LIB_FILES="src/cloud/marketplace/lib/marketplace_client.rb"
MARKET_LIB_CLIENT_FILES="src/cloud/marketplace/lib/marketplace_client.rb"
MARKET_BIN_FILES="src/cloud/marketplace/bin/onemarket-app"
MARKET_BIN_FILES="src/cloud/marketplace/bin/onemarket"
MARKET_BIN_CLIENT_FILES="src/cloud/marketplace/bin/onemarket-app"
MARKET_BIN_CLIENT_FILES="src/cloud/marketplace/bin/onemarket"
#-----------------------------------------------------------------------------
+167
View File
@@ -0,0 +1,167 @@
#!/usr/bin/env ruby
ONE_LOCATION=ENV["ONE_LOCATION"]
if !ONE_LOCATION
RUBY_LIB_LOCATION="/usr/lib/one/ruby"
else
RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
TEMPLATES_LOCATION=ONE_LOCATION+"/etc/occi_templates"
CONF_LOCATION=ONE_LOCATION+"/etc"
end
$: << RUBY_LIB_LOCATION
$: << RUBY_LIB_LOCATION+"/cloud"
require 'marketplace/marketplace_client'
require 'cli/command_parser'
require 'cli/cli_helper'
require 'rubygems'
require 'json'
#
# Options
#
DEFAULT_OPTIONS = [
ENDPOINT = {
:name => "server",
:short => "-s url",
:large => "--server url",
:format => String,
:description => "Marketplace endpoint"
},
USERNAME={
:name => "username",
:short => "-u name",
:large => "--username name",
:format => String,
:description => "User name"
},
PASSWORD={
:name => "password",
:short => "-p pass",
:large => "--password pass",
:format => String,
:description => "User password"
}
]
JSON_FORMAT={
:name => "json",
:short => "-j",
:large => "--json",
:description => "Show in JSON format"
}
#
# Table
#
TABLE = CLIHelper::ShowTable.new(nil, self) do
column :ID, "Appliance", :size=>25 do |d|
d["_id"]["$oid"]
end
column :NAME, "Name", :size=>50 do |d|
d["name"]
end
column :PUBLISHER, "Publisher", :size=>15 do |d|
d["publisher"]
end
default :ID, :NAME, :PUBLISHER
end
#
# Commands
#
cmd=CommandParser::CmdParser.new(ARGV) do
usage "`onemarket` <command> [<args>] [<options>]"
set :option, DEFAULT_OPTIONS
#
# List
#
list_desc = <<-EOT.unindent
List the available appliances in the Marketplace
EOT
command :list, list_desc, :options => JSON_FORMAT do
client = Market::ApplianceClient.new(
options[:username],
options[:password],
options[:server])
response = client.list
if CloudClient::is_error?(response)
[response.code.to_i, response.to_s]
else
if options[:json]
[0,response.body]
else
array_list = JSON.parse(response.body)
TABLE.show(array_list['appliances'])
0
end
end
end
#
# Create
#
create_desc = <<-EOT.unindent
Create a new appliance in the Marketplace
EOT
command :create, create_desc, :file do
client = Market::ApplianceClient.new(
options[:username],
options[:password],
options[:server])
response = client.create(File.read(args[0]))
if CloudClient::is_error?(response)
[response.code.to_i, response.to_s]
else
[0, response.body]
end
end
#
# Show
#
show_desc = <<-EOT.unindent
Show detailed information of a given appliance
EOT
command :show, show_desc, :id, :options => JSON_FORMAT do
client = Market::ApplianceClient.new(
options[:username],
options[:password],
options[:server])
response = client.show(args[0])
if CloudClient::is_error?(response)
[response.code.to_i, response.to_s]
else
if options[:json]
[0,response.body]
else
array_list = JSON.parse(response.body)
TABLE.show(array_list['appliances'])
0
end
end
end
end
@@ -4,8 +4,8 @@ require 'cloud/CloudClient'
module Market
class Client
def initialize(username, password, url)
@username = username || 'admin'
@password = password || 'password'
@username = username
@password = password
url ||= 'http://localhost:9292/'
@uri = URI.parse(url)