opennebula-cli 5.6.2 → 5.7.80.pre

data/bin/oneshowback

@@ -16,38 +16,37 @@
 # 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/oneacct_helper'
 
 require 'json'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
+CommandParser::CmdParser.new(ARGV) do
+    @formats = {}
 
-    @formats = Hash.new
-
-    usage "`oneshowback` <command> [<options>]"
-    description ""
+    usage '`oneshowback` <command> [<options>]'
+    description ''
     version OpenNebulaHelper::ONE_VERSION
 
-    helper=OpenNebulaHelper::OneHelper.new
+    helper = OpenNebulaHelper::OneHelper.new
 
     before_proc do
-        options[:timeout] = 60 #60 sec
+        options[:timeout] = 60 # 60 sec
         helper.set_client(options)
     end
 
-    command :list, "Returns the showback records", :options =>
+    command :list, 'Returns the showback records', :options =>
         AcctHelper::SHOWBACK_OPTIONS + CommandParser::OPTIONS +
         [OpenNebulaHelper::DESCRIBE, CLIHelper::LIST, CLIHelper::CSV_OPT] +
         OpenNebulaHelper::CLIENT_OPTIONS do
@@ -62,7 +61,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         start_month = -1
         start_year  = -1
 
-        if (options[:start_time])
+        if options[:start_time]
             start_month = options[:start_time].month
             start_year  = options[:start_time].year
         end
@@ -70,18 +69,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end_month = -1
         end_year  = -1
 
-        if (options[:end_time])
+        if options[:end_time]
             end_month = options[:end_time].month
             end_year  = options[:end_time].year
         end
 
         common_opts = {
             :start_month => start_month,
-            :start_year  => start_year,
-            :end_month   => end_month,
-            :end_year    => end_year,
-            :group      => options[:group],
-            :xpath      => options[:xpath]
+            :start_year => start_year,
+            :end_month => end_month,
+            :end_year => end_year,
+            :group => options[:group],
+            :xpath => options[:xpath]
         }
 
         pool = OpenNebula::VirtualMachinePool.new(helper.client)
@@ -90,7 +89,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             xml_str = pool.showback_xml(filter_flag, common_opts)
             if OpenNebula.is_error?(xml_str)
                 puts xml_str.message
-                exit -1
+                exit(-1)
             end
 
             if options[:json]
@@ -101,25 +100,22 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             elsif options[:xml]
                 puts xml_str
             end
-
-            exit_code 0
         else
-
-            order_by = Hash.new
+            order_by = {}
             if !options[:csv]
                 order_by[:order_by_1] = 'YEAR'
                 order_by[:order_by_2] = 'MONTH'
             end
 
             data_hash = pool.showback(filter_flag,
-                                        common_opts.merge(order_by))
+                                      common_opts.merge(order_by))
             if OpenNebula.is_error?(data_hash)
                 puts data_hash.message
-                exit -1
+                exit(-1)
             end
 
             if options[:csv]
-                a = Array.new
+                a = []
 
                 if data_hash['SHOWBACK_RECORDS']
                     a = data_hash['SHOWBACK_RECORDS']['SHOWBACK']
@@ -129,29 +125,28 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 exit(0)
             end
 
-            data_hash.each { |year, value|
-                value.each { |month, showback_array|
+            data_hash.each do |year, value|
+                value.each do |month, showback_array|
                     AcctHelper.print_month_header(year, month)
 
                     array = showback_array['SHOWBACK_RECORDS']['SHOWBACK']
                     AcctHelper::SHOWBACK_TABLE.show(array, options)
                     puts
-                }
-
-            }
+                end
+            end
 
-            exit_code 0
         end
+
+        exit_code 0
     end
 
-    command :"calculate", "Calculates the showback records", :options =>
+    command :calculate, 'Calculates the showback records', :options =>
             [AcctHelper::START_TIME_SHOWBACK, AcctHelper::END_TIME_SHOWBACK] do
 
-
         start_month = -1
         start_year  = -1
 
-        if (options[:start_time])
+        if options[:start_time]
             start_month = options[:start_time].month
             start_year  = options[:start_time].year
         end
@@ -159,21 +154,23 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end_month = -1
         end_year  = -1
 
-        if (options[:end_time])
+        if options[:end_time]
             end_month = options[:end_time].month
             end_year  = options[:end_time].year
         end
 
-        rc = OpenNebula::VirtualMachinePool.new(helper.client).
-                calculate_showback(start_month, start_year, end_month, end_year)
+        rc = OpenNebula::VirtualMachinePool.new(helper.client)
+                                           .calculate_showback(start_month,
+                                                               start_year,
+                                                               end_month,
+                                                               end_year)
 
         if OpenNebula.is_error?(rc)
             warn rc.message
-            exit -1
+            exit(-1)
         else
             puts rc
             exit_code 0
         end
-
     end
-end
+end

data/bin/onetemplate

@@ -16,23 +16,23 @@
 # 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/onetemplate_helper'
 require 'one_helper/onevm_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onetemplate` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onetemplate` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneTemplateHelper.new
@@ -41,34 +41,34 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.set_client(options)
     end
 
-    USE={
-        :name  => "use",
-        :large => "--use",
-        :description => "lock use actions"
+    USE = {
+        :name => 'use',
+        :large => '--use',
+        :description => 'lock use actions'
     }
 
-    MANAGE={
-        :name  => "manage",
-        :large => "--manage",
-        :description => "lock manage actions"
+    MANAGE = {
+        :name => 'manage',
+        :large => '--manage',
+        :description => 'lock manage actions'
     }
 
-    ADMIN={
-        :name  => "admin",
-        :large => "--admin",
-        :description => "lock admin actions"
+    ADMIN = {
+        :name => 'admin',
+        :large => '--admin',
+        :description => 'lock admin actions'
     }
 
-    ALL={
-        :name  => "all",
-        :large => "--all",
-        :description => "lock all actions"
+    ALL = {
+        :name => 'all',
+        :large => '--all',
+        :description => 'lock all actions'
     }
 
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+    set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML
@@ -80,18 +80,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         OneTemplateHelper::MULTIPLE,
         OneTemplateHelper::USERDATA,
         OneVMHelper::HOLD,
-        OneTemplateHelper::PERSISTENT,
+        OneTemplateHelper::PERSISTENT
     ]
 
     ########################################################################
     # Formatters for arguments
     ########################################################################
-    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "GROUP")
+    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc('GROUP') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'GROUP')
     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
 
     set :format, :templateid, OneTemplateHelper.to_id_desc do |arg|
@@ -131,12 +131,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :create, create_desc, [:file, nil], :options =>
-            [OneTemplateHelper::VM_NAME]+OpenNebulaHelper::TEMPLATE_OPTIONS+
+            [OneTemplateHelper::VM_NAME] + OpenNebulaHelper::TEMPLATE_OPTIONS +
             [OpenNebulaHelper::DRY] do
 
         if args[0] && OpenNebulaHelper.create_template_options_used?(options)
-            STDERR.puts "You can not use both template file and template"<<
-                " creation options."
+            STDERR.puts 'You can not use both template file and template' \
+                        ' creation options.'
             next -1
         end
 
@@ -161,9 +161,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 else
                     tmpl.allocate(template)
                 end
-            rescue => e
+            rescue StandardError => e
                 STDERR.puts e.messsage
-                exit -1
+                exit(-1)
             end
         end
     end
@@ -173,11 +173,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :clone, clone_desc, :templateid, :name,
-            :options =>OneTemplateHelper::RECURSIVE do
+            :options => OneTemplateHelper::RECURSIVE do
 
         recursive = (options[:recursive] == true)
 
-        helper.perform_action(args[0],options,"cloned") do |t|
+        helper.perform_action(args[0], options, 'cloned') do |t|
             res = t.clone(args[1], recursive)
 
             if !OpenNebula.is_error?(res)
@@ -193,11 +193,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :templateid_list],
-            :options =>OneTemplateHelper::RECURSIVE do
+            :options => OneTemplateHelper::RECURSIVE do
 
         recursive = (options[:recursive] == true)
 
-        helper.perform_actions(args[0],options,"deleted") do |t|
+        helper.perform_actions(args[0], options, 'deleted') do |t|
             t.delete(recursive)
         end
     end
@@ -211,12 +211,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :instantiate, instantiate_desc, :templateid, [:file, nil],
-            :options=>instantiate_options+OpenNebulaHelper::TEMPLATE_OPTIONS do
-        exit_code=0
+            :options => instantiate_options +
+                        OpenNebulaHelper::TEMPLATE_OPTIONS do
+        exit_code = 0
 
         if args[1] && OpenNebulaHelper.create_template_options_used?(options)
-            STDERR.puts "You cannot use both template file and template"<<
-                " creation options."
+            STDERR.puts 'You cannot use both template file and template' \
+                        ' creation options.'
             next -1
         end
 
@@ -224,14 +225,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         user_inputs = nil
 
         number.times do |i|
-            exit_code=helper.perform_action(args[0], options,
-                                            "instantiated") do |t|
+            exit_code = helper.perform_action(args[0], options,
+                                              'instantiated') do |t|
                 name = options[:name]
-                name = name.gsub("%i",i.to_s) if name
+                name = name.gsub('%i', i.to_s) if name
 
-                on_hold = options[:hold] != nil
+                on_hold = !options[:hold].nil?
 
-                extra_template = ""
+                extra_template = ''
                 rc = t.info
 
                 if OpenNebula.is_error?(rc)
@@ -252,11 +253,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     extra_template = res.last
                 end
 
-                user_inputs = OneTemplateHelper.get_user_inputs(t.to_hash) unless user_inputs
+                if !user_inputs
+                    user_inputs = OneTemplateHelper.get_user_inputs(t.to_hash)
+                end
 
-                extra_template << "\n" << user_inputs
+                extra_template << "\n#{user_inputs}"
 
-                persistent = options[:persistent] != nil
+                persistent = !options[:persistent].nil?
 
                 res = t.instantiate(name, on_hold, extra_template, persistent)
 
@@ -267,7 +270,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 res
             end
 
-            break if exit_code==-1
+            break if exit_code == -1
         end
 
         exit_code
@@ -277,8 +280,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Changes the Template group
     EOT
 
-    command :chgrp, chgrp_desc,[:range, :templateid_list], :groupid do
-        helper.perform_actions(args[0],options,"Group changed") do |t|
+    command :chgrp, chgrp_desc, [:range, :templateid_list], :groupid do
+        helper.perform_actions(args[0], options, 'Group changed') do |t|
             t.chown(-1, args[1].to_i)
         end
     end
@@ -288,9 +291,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chown, chown_desc, [:range, :templateid_list], :userid,
-            [:groupid,nil] do
-        gid = args[2].nil? ? -1 : args[2].to_i
-        helper.perform_actions(args[0],options,"Owner/Group changed") do |t|
+            [:groupid, nil] do
+        args[2].nil? ? gid = -1 : gid = args[2].to_i
+        helper.perform_actions(args[0], options, 'Owner/Group changed') do |t|
             t.chown(args[1].to_i, gid)
         end
     end
@@ -300,11 +303,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chmod, chmod_desc, [:range, :templateid_list], :octet,
-            :options =>OneTemplateHelper::RECURSIVE do
+            :options => OneTemplateHelper::RECURSIVE do
 
         recursive = (options[:recursive] == true)
 
-        helper.perform_actions(args[0],options, "Permissions changed") do |t|
+        helper.perform_actions(args[0], options, 'Permissions changed') do |t|
             t.chmod_octet(args[1], recursive)
         end
     end
@@ -315,8 +318,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :templateid, [: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
@@ -339,12 +342,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :templateid, :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
 
-    command :list, list_desc, [:filterflag, nil], :options=>list_options do
+    command :list, list_desc, [:filterflag, nil], :options => list_options do
         helper.list_pool(options, false, args[0])
     end
 
@@ -353,22 +356,22 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :templateid,
-        :options=>[OpenNebulaHelper::XML,OneTemplateHelper::EXTENDED] do
+            :options => [OpenNebulaHelper::XML, OneTemplateHelper::EXTENDED] do
 
-        helper.show_resource(args[0],options)
+        helper.show_resource(args[0], options)
     end
 
     top_desc = <<-EOT.unindent
         Lists Templates continuously
     EOT
 
-    command :top, top_desc, [:filterflag, nil], :options=>list_options do
+    command :top, top_desc, [:filterflag, nil], :options => list_options do
         helper.list_pool(options, true, args[0])
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VM with differents levels for lock any actions with this VM, show and
-        monitoring never will be locked.
+        Locks a VM with differents levels for lock any actions with this VM,
+        show and monitoring never will be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -377,8 +380,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :lock, lock_desc, :templateid,
-        :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0],options,"Template locked") do |t|
+            :options => [USE, MANAGE, ADMIN, ALL] do
+        helper.perform_action(args[0], options, 'Template locked') do |t|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -400,7 +403,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :unlock, unlock_desc, :templateid do
-        helper.perform_action(args[0],options,"Template unlocked") do |t|
+        helper.perform_action(args[0], options, 'Template unlocked') do |t|
             t.unlock
         end
     end