opennebula-cli 5.6.2 → 5.7.80.pre

data/bin/onegroup

@@ -16,22 +16,22 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-ONE_LOCATION=ENV["ONE_LOCATION"]
+ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
-    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
 else
-    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
 end
 
-$: << RUBY_LIB_LOCATION
-$: << RUBY_LIB_LOCATION+"/cli"
+$LOAD_PATH << RUBY_LIB_LOCATION
+$LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
 require 'command_parser'
 require 'one_helper/onegroup_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onegroup` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onegroup` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneGroupHelper.new
@@ -43,7 +43,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+    set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML
@@ -61,8 +61,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.list_to_id(arg)
     end
 
-    set :format, :userid, OpenNebulaHelper.rname_to_id_desc("USER") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "USER")
+    set :format, :userid, OpenNebulaHelper.rname_to_id_desc('USER') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'USER')
     end
 
     ########################################################################
@@ -89,14 +89,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         if options && options[:admin_user]
             if !options[:admin_password]
-                STDERR.puts "Admin user needs password"
+                STDERR.puts 'Admin user needs password'
                 next -1
             end
 
-            admin_user=Hash.new
+            admin_user = {}
             admin_user[:name]       = options[:admin_user]
             admin_user[:password]   = options[:admin_password]
-            admin_user[:auth_driver]= options[:admin_driver] if options[:admin_driver]
+            if options[:admin_driver]
+                admin_user[:auth_driver] = options[:admin_driver]
+            end
 
             options[:group_admin] = admin_user
         end
@@ -107,8 +109,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         elsif options[:name]
             helper.create_complete_resource(options)
         else
-            STDERR.puts "Please use either a group name or command arguments."<<
-            " Run onegroup create -h for more information"
+            STDERR.puts 'Please use either a group name or command arguments.'\
+                        ' Run onegroup create -h for more information'
             next -1
         end
     end
@@ -119,8 +121,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :groupid, [:file, nil],
-    :options=>OpenNebulaHelper::APPEND do
-        helper.perform_action(args[0],options,"modified") do |obj|
+            :options => OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0], options, 'modified') do |obj|
             if options[:append]
                 str = OpenNebulaHelper.append_template(args[0], obj, args[1])
             else
@@ -139,7 +141,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :groupid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |obj|
+        helper.perform_actions(args[0], options, 'deleted') do |obj|
             obj.delete
         end
     end
@@ -148,7 +150,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists Groups in the pool
     EOT
 
-    command :list, list_desc, :options=>list_options do
+    command :list, list_desc, :options => list_options do
         helper.list_pool(options)
     end
 
@@ -156,9 +158,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Group
     EOT
 
-    command :show, show_desc,[:groupid, nil], :options=>OpenNebulaHelper::XML do
+    command :show, show_desc, [:groupid, nil],
+            :options => OpenNebulaHelper::XML do
         group = args[0] || OpenNebula::Group::SELF
-        helper.show_resource(group,options)
+        helper.show_resource(group, options)
     end
 
     add_admin_desc = <<-EOT.unindent
@@ -166,7 +169,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :addadmin, add_admin_desc, [:range, :groupid_list], :userid do
-        helper.perform_actions(args[0],options,"admin added") do |obj|
+        helper.perform_actions(args[0], options, 'admin added') do |obj|
             obj.add_admin(args[1].to_i)
         end
     end
@@ -176,7 +179,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :deladmin, del_admin_desc, [:range, :groupid_list], :userid do
-        helper.perform_actions(args[0],options,"admin deleted") do |obj|
+        helper.perform_actions(args[0], options, 'admin deleted') do |obj|
             obj.del_admin(args[1].to_i)
         end
     end
@@ -187,12 +190,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :quota, quota_desc, :groupid, [:file, nil] do
-        helper.perform_action(args[0], options, "modified") do |group|
+        helper.perform_action(args[0], options, 'modified') do |group|
             rc = group.info
 
             if OpenNebula.is_error?(rc)
                 puts rc.message
-                exit -1
+                exit(-1)
             end
 
             str = OneQuotaHelper.set_quota(group, args[1])
@@ -200,7 +203,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
             if OpenNebula.is_error?(rc)
                 puts rc.message
-                exit -1
+                exit(-1)
             end
         end
     end
@@ -214,19 +217,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             [:file, nil] do
         batch_str = OneQuotaHelper.get_batch_quota(args[1])
 
-        helper.perform_actions(args[0], options, "modified") do |group|
+        helper.perform_actions(args[0], options, 'modified') do |group|
             str = OneQuotaHelper.merge_quota(group, batch_str)
 
             if OpenNebula.is_error?(str)
                 str
             else
-                rc  = group.set_quota(str)
+                rc = group.set_quota(str)
                 rc
             end
         end
     end
 
-
     defaultquota_desc = <<-EOT.unindent
         Sets the default quota limits for the groups. If a path is not provided
         the editor will be launched to modify the current default quotas.
@@ -235,7 +237,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     command :defaultquota, defaultquota_desc, [:file, nil] do
         system = System.new(OneGroupHelper.get_client(options))
 
-        default_quotas = system.get_group_quotas()
+        default_quotas = system.get_group_quotas
 
         if OpenNebula.is_error?(default_quotas)
             puts default_quotas.message

data/bin/onehost

@@ -16,25 +16,25 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-ONE_LOCATION=ENV["ONE_LOCATION"]
+ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
-    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
-    REMOTES_LOCATION="/var/lib/one/remotes/"
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    REMOTES_LOCATION = '/var/lib/one/remotes/'
 else
-    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
-    REMOTES_LOCATION=ONE_LOCATION+"/var/remotes/"
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    REMOTES_LOCATION = ONE_LOCATION + '/var/remotes/'
 end
 
-$: << RUBY_LIB_LOCATION
-$: << RUBY_LIB_LOCATION+"/cli"
+$LOAD_PATH << RUBY_LIB_LOCATION
+$LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
 require 'command_parser'
 require 'one_helper/onehost_helper'
 require 'one_helper/onecluster_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onehost` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onehost` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneHostHelper.new
@@ -46,49 +46,50 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     ########################################################################
     # Global Options
     ########################################################################
-    cmd_options=CommandParser::OPTIONS-[CommandParser::VERBOSE]
-    set :option, cmd_options+OpenNebulaHelper::CLIENT_OPTIONS
+    cmd_options = CommandParser::OPTIONS - [CommandParser::VERBOSE]
+    set :option, cmd_options + OpenNebulaHelper::CLIENT_OPTIONS
 
     IM = {
-    :name   => "im",
-    :short  => "-i im_mad",
-    :large  => "--im im_mad" ,
-    :description => "Set the information driver for the host",
-    :format => String
+        :name => 'im',
+        :short => '-i im_mad',
+        :large => '--im im_mad',
+        :description => 'Set the information driver for the host',
+        :format => String
     }
 
     VMM = {
-    :name   => "vm",
-    :short  => "-v vmm_mad",
-    :large  => "--vm vmm_mad" ,
-    :description => "Set the virtualization driver for the host",
-    :format => String
+        :name => 'vm',
+        :short => '-v vmm_mad',
+        :large => '--vm vmm_mad',
+        :description => 'Set the virtualization driver for the host',
+        :format => String
     }
 
     FORCE = {
-        :name   => "force",
-        :large  => "--force" ,
-        :description => "Force probe upgrade in onehost sync"
+        :name => 'force',
+        :large => '--force',
+        :description => 'Force probe upgrade in onehost sync'
     }
 
     RSYNC = {
-        :name   => "rsync",
-        :large  => "--rsync" ,
-        :description => "Use rsync to synchronize remotes. In case some " <<
-            "probes are no longer in the fronted are deleted in the hosts." <<
-            " rsync command must be installed in the frontend and nodes."
+        :name => 'rsync',
+        :large => '--rsync',
+        :description => 'Use rsync to synchronize remotes. In case some '\
+                        'probes are no longer in the fronted ithey will be '\
+                        'deleted in the hosts. rsync command must be '\
+                        'installed in the frontend and nodes.'
     }
 
     TYPE = {
-        :name  => "type",
-        :short => "-t remote_provider",
-        :large => "--type remote_provider",
-        :description => "Use type to create a host using Cloud Bursting ",
+        :name => 'type',
+        :short => '-t remote_provider',
+        :large => '--type remote_provider',
+        :description => 'Use type to create a host using Cloud Bursting',
         :format => String
     }
 
-    CREAT_OPTIONS = [ IM, VMM, OneClusterHelper::CLUSTER, TYPE ]
-    SYNC_OPTIONS  = [ OneClusterHelper::CLUSTER, FORCE, RSYNC ]
+    CREAT_OPTIONS = [IM, VMM, OneClusterHelper::CLUSTER, TYPE]
+    SYNC_OPTIONS  = [OneClusterHelper::CLUSTER, FORCE, RSYNC]
 
     ########################################################################
     # Formatters for arguments
@@ -110,12 +111,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Creates a new Host
     EOT
 
-    command :create, create_desc, :hostname, [:file, nil], :options=>CREAT_OPTIONS do
+    command :create, create_desc, :hostname,
+            [:file, nil], :options => CREAT_OPTIONS do
         if options[:im].nil? || options[:vm].nil?
-            STDERR.puts "Drivers are mandatory to create a host:"
-            STDERR.puts "\t -i information driver"
-            STDERR.puts "\t -v hypervisor driver"
-            exit -1
+            STDERR.puts 'Drivers are mandatory to create a host:'
+            STDERR.puts '\t -i information driver'
+            STDERR.puts '\t -v hypervisor driver'
+            exit(-1)
         end
 
         cid = options[:cluster] || ClusterPool::NONE_CLUSTER_ID
@@ -124,7 +126,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = helper.set_hybrid(options[:type], args[1])
             end
             rc = host.allocate(args[0], options[:im], options[:vm], cid)
-            host.update(str, true) if !OpenNebula.is_error?(rc) && !options[:type].nil?
+            if !OpenNebula.is_error?(rc) && !options[:type].nil?
+                host.update(str, true)
+            end
 
             rc
         end
@@ -135,7 +139,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :hostid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |host|
+        helper.perform_actions(args[0], options, 'deleted') do |host|
             host.delete
         end
     end
@@ -144,8 +148,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Enables the given host, fully operational
     EOT
 
-    command :enable, enable_desc, [:range,:hostid_list] do
-        helper.perform_actions(args[0],options,"enabled") do |host|
+    command :enable, enable_desc, [:range, :hostid_list] do
+        helper.perform_actions(args[0], options, 'enabled') do |host|
             host.enable
         end
     end
@@ -157,8 +161,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
           - manual deployment: enabled
     EOT
 
-    command :disable, disable_desc, [:range,:hostid_list] do
-        helper.perform_actions(args[0],options,"disabled") do |host|
+    command :disable, disable_desc, [:range, :hostid_list] do
+        helper.perform_actions(args[0], options, 'disabled') do |host|
             host.disable
         end
     end
@@ -170,8 +174,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
           - manual deployment: disabled
     EOT
 
-    command :offline, offline_desc, [:range,:hostid_list] do
-        helper.perform_actions(args[0],options,"offline") do |host|
+    command :offline, offline_desc, [:range, :hostid_list] do
+        helper.perform_actions(args[0], options, 'offline') do |host|
             host.offline
         end
     end
@@ -182,8 +186,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :hostid, [:file, nil],
-    :options=>OpenNebulaHelper::APPEND do
-        helper.perform_action(args[0],options,"updated") do |obj|
+            :options => OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0], options, 'updated') do |obj|
             if options[:append]
                 str = OpenNebulaHelper.append_template(args[0], obj, args[1])
             else
@@ -207,7 +211,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :sync, sync_desc, [:range, :hostid_list, nil],
-            :options=>SYNC_OPTIONS do
+            :options => SYNC_OPTIONS do
         helper.sync(args[0], options)
     end
 
@@ -216,8 +220,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :list, list_desc,
-            :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS+
-            [OpenNebulaHelper::DESCRIBE] do
+            :options => CLIHelper::OPTIONS + OpenNebulaHelper::OPTIONS +
+                        [OpenNebulaHelper::DESCRIBE] do
         helper.list_pool(options)
     end
 
@@ -226,8 +230,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :hostid,
-            :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+            :options => OpenNebulaHelper::XML do
+        helper.show_resource(args[0], options)
     end
 
     top_desc = <<-EOT.unindent
@@ -235,7 +239,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :top, top_desc,
-            :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do
+            :options => CLIHelper::OPTIONS + OpenNebulaHelper::OPTIONS do
         helper.list_pool(options, true)
     end
 
@@ -243,17 +247,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Disables the host and reschedules all the running VMs in it.
     EOT
 
-    command :flush, flush_desc, [:range,:hostid_list] do
+    command :flush, flush_desc, [:range, :hostid_list] do
         begin
             if !ONE_LOCATION
-                action = YAML.load_file("/etc/one/cli/onehost.yaml")[:default_actions][0][:flush]
+                action = YAML.load_file('/etc/one/cli/onehost.yaml')
             else
-                action = YAML.load_file("#{ONE_LOCATION}/etc/cli/onehost.yaml")[:default_actions][0][:flush]
+                action = YAML.load_file("#{ONE_LOCATION}/etc/cli/onehost.yaml")
             end
-        rescue Exception => e
+            action = action[:default_actions][0][:flush]
+        rescue StandardError => e
             STDERR.puts e
         end
-        helper.perform_actions(args[0],options,"flush") do |host|
+        helper.perform_actions(args[0], options, 'flush') do |host|
             host.flush action
         end
     end
@@ -263,7 +268,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :hostid, :name do
-        helper.perform_action(args[0],options,"renamed") do |o|
+        helper.perform_action(args[0], options, 'renamed') do |o|
             o.rename(args[1])
         end
     end
@@ -273,7 +278,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :importvm, importvm_desc, :hostid, :name do
-        helper.perform_action(args[0], options, "imported") do |o|
+        helper.perform_action(args[0], options, 'imported') do |o|
             rc = o.info
             next rc if OpenNebula.is_error?(rc)