From b97ef1d2d9c7f66b656d83f774be255e469bdcb1 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Fri, 16 Nov 2012 16:42:57 +0100 Subject: [PATCH] feature #1570: add support for user, password and endpoint parameters --- src/cli/one_helper.rb | 87 +++++++++++++++++++++++++--- src/cli/one_helper/onehost_helper.rb | 1 + src/cli/oneacct | 4 +- src/cli/oneacl | 6 +- src/cli/onecluster | 6 +- src/cli/onedatastore | 6 +- src/cli/onegroup | 6 +- src/cli/onehost | 6 +- src/cli/oneimage | 6 +- src/cli/onetemplate | 6 +- src/cli/oneuser | 26 +++------ src/cli/onevm | 5 +- src/cli/onevnet | 6 +- 13 files changed, 133 insertions(+), 38 deletions(-) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index d382ffaf13..8312b40904 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -76,6 +76,27 @@ EOT :format => String } + CLIENT_OPTIONS=[ + { + :name => 'user', + :large => '--user name', + :description => 'User name used to connect to OpenNebula', + :format => String + }, + { + :name => 'password', + :large => '--password password', + :description => 'Password to authenticate with OpenNebula', + :format => String + }, + { + :name => 'endpoint', + :large => '--endpoint endpoing', + :description => 'URL of OpenNebula xmlrpc frontend', + :format => String + } + ] + TEMPLATE_OPTIONS=[ { :name => 'cpu', @@ -182,17 +203,67 @@ EOT OPTIONS = XML, NUMERIC, KILOBYTES class OneHelper - def initialize(secret=nil, endpoint=nil) - begin - @client = OpenNebula::Client.new(secret,endpoint) - rescue Exception => e - puts e.message - exit -1 + attr_accessor :client + + def self.get_client(options) + if defined?(@@client) + @@client + else + secret=nil + user=options[:user] + if user + password=options[:password]||self.get_password + secret="#{user}:#{password}" + end + + endpoint=options[:endpoint] + + @@client=OpenNebula::Client.new(secret, endpoint) end + end + + def self.client + if defined?(@@client) + @@client + else + self.get_client({}) + end + end + + if RUBY_VERSION>="1.9.3" + require 'io/console' + def self.get_password + print "Password: " + pass=nil + STDIN.noecho {|io| pass=io.gets } + puts + + pass.chop! if pass + pass + end + else + def self.get_password + print "Password: " + system("stty", "-echo") + begin + return gets.chop + ensure + system("stty", "echo") + print "\n" + end + end + end + + def initialize(secret=nil, endpoint=nil) + @client=nil @translation_hash = nil end + def set_client(options) + @client=OpenNebulaHelper::OneHelper.get_client(options) + end + def create_resource(options, &block) resource = factory @@ -411,7 +482,7 @@ EOT end def pool_to_array(pool) - if !pool.instance_of?(Hash) + if !pool.instance_of?(Hash) phash = pool.to_hash else phash = pool @@ -450,7 +521,7 @@ EOT def OpenNebulaHelper.rname_to_id(name, poolname) return 0, name.to_i if name.match(/^[0123456789]+$/) - client = OpenNebula::Client.new + client=OneHelper.client pool = case poolname when "HOST" then OpenNebula::HostPool.new(client) diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index a594c09633..e52c4a1704 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -199,6 +199,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper puts onevm_helper=OneVMHelper.new + onevm_helper.client=@client onevm_helper.list_pool({:filter=>["HOST=#{host.name}"]}, false) end end diff --git a/src/cli/oneacct b/src/cli/oneacct index 728984a53d..97a269c029 100755 --- a/src/cli/oneacct +++ b/src/cli/oneacct @@ -37,6 +37,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do description "" version OpenNebulaHelper::ONE_VERSION + client = OpenNebulaHelper::OneHelper.get_client({}) option AcctHelper::ACCT_OPTIONS + CommandParser::OPTIONS @@ -53,10 +54,8 @@ cmd = CommandParser::CmdParser.new(ARGV) do :xpath => options[:xpath] } - client = OpenNebula::Client.new pool = OpenNebula::VirtualMachinePool.new(client) - if options[:json] || options[:xml] xml_str = pool.accounting_xml(filter_flag, common_opts) if OpenNebula.is_error?(xml_str) @@ -85,6 +84,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do exit -1 end + if ( start_time != -1 or end_time != -1 ) AcctHelper.print_start_end_time_header(start_time, end_time) end diff --git a/src/cli/oneacl b/src/cli/oneacl index 7dc5281c2a..9ad216f9a5 100755 --- a/src/cli/oneacl +++ b/src/cli/oneacl @@ -36,10 +36,14 @@ cmd = CommandParser::CmdParser.new(ARGV) do helper = OneAclHelper.new + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS ######################################################################## # Formatters for arguments diff --git a/src/cli/onecluster b/src/cli/onecluster index 9fc41c2e6b..0362d908bb 100755 --- a/src/cli/onecluster +++ b/src/cli/onecluster @@ -36,10 +36,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do helper = OneClusterHelper.new + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS list_options = CLIHelper::OPTIONS list_options << OpenNebulaHelper::XML diff --git a/src/cli/onedatastore b/src/cli/onedatastore index 550d015003..9f58d16f6c 100755 --- a/src/cli/onedatastore +++ b/src/cli/onedatastore @@ -37,10 +37,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do helper = OneDatastoreHelper.new + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS list_options = CLIHelper::OPTIONS list_options << OpenNebulaHelper::XML diff --git a/src/cli/onegroup b/src/cli/onegroup index bb191bc84d..6fc81e561e 100755 --- a/src/cli/onegroup +++ b/src/cli/onegroup @@ -36,10 +36,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do helper = OneGroupHelper.new + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS list_options = CLIHelper::OPTIONS list_options << OpenNebulaHelper::XML diff --git a/src/cli/onehost b/src/cli/onehost index d08a487223..364dfcaf61 100755 --- a/src/cli/onehost +++ b/src/cli/onehost @@ -37,10 +37,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do helper = OneHostHelper.new + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS IM = { :name => "im", diff --git a/src/cli/oneimage b/src/cli/oneimage index c63ca447c8..df71c6a568 100755 --- a/src/cli/oneimage +++ b/src/cli/oneimage @@ -37,10 +37,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do helper = OneImageHelper.new + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS list_options = CLIHelper::OPTIONS list_options << OpenNebulaHelper::XML diff --git a/src/cli/onetemplate b/src/cli/onetemplate index e1c6904359..af2da5f1cc 100755 --- a/src/cli/onetemplate +++ b/src/cli/onetemplate @@ -36,10 +36,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do helper = OneTemplateHelper.new + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS list_options = CLIHelper::OPTIONS list_options << OpenNebulaHelper::XML diff --git a/src/cli/oneuser b/src/cli/oneuser index 12600e0412..1c0dac8bbb 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -37,10 +37,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do usage "`oneuser` [] []" version OpenNebulaHelper::ONE_VERSION + helper = OneUserHelper.new + + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS list_options = CLIHelper::OPTIONS list_options << OpenNebulaHelper::XML @@ -135,12 +141,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do end set :format, :userid, OneUserHelper.to_id_desc do |arg| - helper = OneUserHelper.new helper.to_id(arg) end set :format, :userid_list, OneUserHelper.list_to_id_desc do |arg| - helper = OneUserHelper.new helper.list_to_id(arg) end @@ -164,8 +168,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do command :create, create_desc, :username, [:password, nil], :options=>create_options do - helper = OneUserHelper.new - if args[1] pass = args[1] else @@ -190,8 +192,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :update, update_desc, :userid, [:file, nil] do - helper = OneUserHelper.new - helper.perform_action(args[0],options,"modified") do |user| str = OpenNebulaHelper.update_template(args[0], user, args[1]) user.update(str) @@ -204,8 +204,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :quota, quota_desc, :userid, [:file, nil] do - helper = OneUserHelper.new - helper.perform_action(args[0], options, "modified") do |user| str = OneQuotaHelper.set_quota(user, args[1]) rc = user.set_quota(str) @@ -224,8 +222,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :batchquota, batchquota_desc, [:range, :userid_list], [:file, nil] do - helper = OneUserHelper.new - batch_str = OneQuotaHelper.get_batch_quota(args[1]) helper.perform_actions(args[0], options, "modified") do |user| @@ -282,7 +278,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :delete, delete_desc, [:range, :userid_list] do - helper = OneUserHelper.new helper.perform_actions(args[0], options, "deleted") do |user| user.delete end @@ -294,8 +289,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do command :passwd, passwd_desc, :userid, [:password, nil], :options=>create_options do - helper = OneUserHelper.new - if args[1] pass = args[1] else @@ -317,7 +310,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :chgrp, chgrp_desc, [:range, :userid_list], :groupid do - helper = OneUserHelper.new helper.perform_actions(args[0],options,"Group changed") do |user| user.chgrp(args[1].to_i) end @@ -344,8 +336,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do exit_with_code 0, "An Auth driver should be specified" end - helper = OneUserHelper.new - if args[2] pass = args[2] else @@ -369,7 +359,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :list, list_desc, :options=>list_options do - helper = OneUserHelper.new helper.list_pool(options) end @@ -380,7 +369,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do command :show, show_desc, [:userid, nil], :options=>OpenNebulaHelper::XML do user=args[0] || OpenNebula::User::SELF - helper = OneUserHelper.new helper.show_resource(user,options) end diff --git a/src/cli/onevm b/src/cli/onevm index d1bf271973..0e1f3c15de 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -36,6 +36,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do helper = OneVMHelper.new + before_proc do + helper.set_client(options) + end TYPE={ :name => "type", @@ -56,7 +59,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS ######################################################################## # Formatters for arguments diff --git a/src/cli/onevnet b/src/cli/onevnet index 7c28994113..12638fc2a8 100755 --- a/src/cli/onevnet +++ b/src/cli/onevnet @@ -37,10 +37,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do helper = OneVNetHelper.new + before_proc do + helper.set_client(options) + end + ######################################################################## # Global Options ######################################################################## - set :option, CommandParser::OPTIONS + set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS CREATE_OPTIONS = [OneClusterHelper::CLUSTER]