From c28404d4691cdbede39da80b01aa8655a65d9e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Font=C3=A1n=20Mui=C3=B1os?= Date: Tue, 25 Aug 2009 12:16:56 +0000 Subject: [PATCH] Added parameter range expansion to onehost, onevnet and oneuser (#130) git-svn-id: http://svn.opennebula.org/one/trunk@772 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/client/ruby/onehost | 79 +++++++++++++++++++++++++---------------- src/client/ruby/oneuser | 42 ++++++++++++---------- src/client/ruby/onevnet | 73 ++++++++++++++++++++----------------- 3 files changed, 111 insertions(+), 83 deletions(-) diff --git a/src/client/ruby/onehost b/src/client/ruby/onehost index b0cc1a22d8..e100de0d66 100755 --- a/src/client/ruby/onehost +++ b/src/client/ruby/onehost @@ -236,6 +236,8 @@ when "add", "create" when "show" check_parameters("show", 1) + #args=expand_args(ARGV) + host_id=get_host_id(ARGV[0]) host=OpenNebula::Host.new_with_id(host_id, get_one_client) @@ -282,29 +284,34 @@ when "show" when "delete" check_parameters("delete", 1) - host_id=get_host_id(ARGV[0]) - - host = OpenNebula::Host.new_with_id(host_id,get_one_client) + args=expand_args(ARGV) - rc = host.info + args.each do |param| + host_id=get_host_id(param) + + host = OpenNebula::Host.new_with_id(host_id,get_one_client) - if OpenNebula::is_error?(rc) - puts rc.message - exit -1 - end + rc = host.info - if host['host_shares/running_vms'].to_i != 0 - puts "Host still has associated VMs. It will be disabled instead." - result=host.disable - if is_successful?(result) - puts "Host disabled" if ops[:verbose] - exit 0 + if OpenNebula::is_error?(rc) + puts rc.message + exit -1 end - else - result=host.delete - if is_successful?(result) - puts "Host deleted" if ops[:verbose] - exit 0 + + if host['host_shares/running_vms'].to_i != 0 + puts "Host still has associated VMs. It will be disabled instead." + result=host.disable + if is_successful?(result) + puts "Host disabled" if ops[:verbose] + else + break + end + else + result=host.delete + if is_successful?(result) + puts "Host deleted" if ops[:verbose] + exit 0 + end end end @@ -326,22 +333,32 @@ when "top" when "enable" check_parameters("enable", 1) - host_id=get_host_id(ARGV[0]) - host = OpenNebula::Host.new_with_id(host_id,get_one_client) - result=host.enable - if is_successful?(result) - puts "Host enabled" if ops[:verbose] - exit 0 + args=expand_args(ARGV) + + args.each do |param| + host_id=get_host_id(param) + host = OpenNebula::Host.new_with_id(host_id,get_one_client) + result=host.enable + if is_successful?(result) + puts "Host enabled" if ops[:verbose] + else + break + end end when "disable" check_parameters("disable", 1) - host_id=get_host_id(ARGV[0]) - host = OpenNebula::Host.new_with_id(host_id,get_one_client) - result=host.disable - if is_successful?(result) - puts "Host disabled" if ops[:verbose] - exit 0 + args=expand_args(ARGV) + + args.each do |param| + host_id=get_host_id(param) + host = OpenNebula::Host.new_with_id(host_id,get_one_client) + result=host.disable + if is_successful?(result) + puts "Host disabled" if ops[:verbose] + else + break + end end else diff --git a/src/client/ruby/oneuser b/src/client/ruby/oneuser index a6ed0a464e..d93c7b0fdb 100755 --- a/src/client/ruby/oneuser +++ b/src/client/ruby/oneuser @@ -167,28 +167,32 @@ when "create" when "delete" check_parameters("delete", 1) - user_id=get_user_id(ARGV[0]) + args=expand_args(ARGV) - # Check if the user has defined VM's - vms=false - vmpool=OpenNebula::VirtualMachinePool.new( - get_one_client, user_id) - vmpool.info - vmpool.each{ vms=true ; break } + args.each do |param| + user_id=get_user_id(param) - if vms - puts "The user still has VM's defined, type YES if you are sure you" - print "want to delete this user: " - answer=STDIN.gets.strip - exit -1 if answer != 'YES' - end + # Check if the user has defined VM's + vms=false + vmpool=OpenNebula::VirtualMachinePool.new( + get_one_client, user_id) + vmpool.info + vmpool.each{ vms=true ; break } - user=OpenNebula::User.new( - OpenNebula::User.build_xml(user_id), get_one_client) - result=user.delete - if !OpenNebula.is_error?(result) - puts "User deleted" if ops[:verbose] - exit 0 + if vms + puts "The user #{param} still has VM's defined, "+ + "type YES if you are sure you" + print "want to delete this user: " + answer=STDIN.gets.strip + exit -1 if answer != 'YES' + end + + user=OpenNebula::User.new( + OpenNebula::User.build_xml(user_id), get_one_client) + result=user.delete + if !OpenNebula.is_error?(result) + puts "User deleted" if ops[:verbose] + end end when "list" diff --git a/src/client/ruby/onevnet b/src/client/ruby/onevnet index 7072eb9b4a..56889aef5d 100755 --- a/src/client/ruby/onevnet +++ b/src/client/ruby/onevnet @@ -209,48 +209,55 @@ when "create" when "show" check_parameters("show", 1) - vn_id=get_vn_id(ARGV[0]) - vn=OpenNebula::VirtualNetwork.new_with_id(vn_id, get_one_client) - result=vn.info - if is_successful?(result) - if !ops[:xml] - str_h1="%-80s" - str="%-10s: %-20s" - print_header(str_h1, - "VIRTUAL NETWORK #{vn.id.to_s} INFORMATION",true) + args=expand_args(ARGV) + + args.each do |param| + vn_id=get_vn_id(param) + vn=OpenNebula::VirtualNetwork.new_with_id(vn_id, get_one_client) + result=vn.info + if is_successful?(result) + if !ops[:xml] + str_h1="%-80s" + str="%-10s: %-20s" + print_header(str_h1, + "VIRTUAL NETWORK #{vn.id.to_s} INFORMATION",true) - puts str % ["ID: ",vn.id.to_s] - puts str % ["UID: ",vn["UID"]] - puts - print_header(str_h1,"VIRTUAL NETWORK TEMPLATE",false) - - puts vn.template_str(false) - - leases_str = vn.template_like_str('/VNET/LEASES', false) - - if !leases_str.empty? + puts str % ["ID: ",vn.id.to_s] + puts str % ["UID: ",vn["UID"]] puts - print_header(str_h1,"LEASES INFORMATION",false) - puts leases_str + print_header(str_h1,"VIRTUAL NETWORK TEMPLATE",false) + + puts vn.template_str(false) + + leases_str = vn.template_like_str('/VNET/LEASES', false) + + if !leases_str.empty? + puts + print_header(str_h1,"LEASES INFORMATION",false) + puts leases_str + end + else + puts vn.to_xml end else - puts vn.to_xml + puts "Error: "+result.message + break end - else - puts "Error: "+result.message - exit -1 end when "delete" check_parameters("delete", 1) - vn_id=get_vn_id(ARGV[0]) - vn=OpenNebula::VirtualNetwork.new( - OpenNebula::VirtualNetwork.build_xml(vn_id), get_one_client) - result=vn.delete - if !OpenNebula.is_error?(result) - puts "Virtual Network deleted" if ops[:verbose] - exit 0 - end + args=expand_args(ARGV) + + args.each do |param| + vn_id=get_vn_id(param) + vn=OpenNebula::VirtualNetwork.new( + OpenNebula::VirtualNetwork.build_xml(vn_id), get_one_client) + result=vn.delete + if !OpenNebula.is_error?(result) + puts "Virtual Network deleted" if ops[:verbose] + break + end when "list" if ARGV[0]