opennebula-cli 5.6.2 → 5.7.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1313a09ad69bd8995ea3d0f18e3d2c14fab328
-  data.tar.gz: a473397450005c9ece8ac0c828112fa283771a27
+  metadata.gz: 2ba87b7b6263e5d961a1ad9dc27b968dc0b3bc06
+  data.tar.gz: 4ac8190cf143f12a8045468b313fe15c193342ff
 SHA512:
-  metadata.gz: 4881c31920ba49fe702a331342edb631b0583d998ed698f39d88ebe2ed4f1cc5d40ef586314c62e24acd4a570cae6dd1c58025720079666619b2a6a0ec42e2e1
-  data.tar.gz: 962c7bda318cf8597f26af880d292a9f7524fad71198785c040c1b4a4e38e2152ef5e3912b5bb8c63095b9409a9c9392a83a4429c63265ddc8856ba3ae079be4
+  metadata.gz: 70e93597b3f7a76f988c4137b9de0f0bdfd49374dd4572156d4de01581adaba6935bc5af600abed448c117f3f35bbcda43fc1c1b6a2ae9ff1e913b1fe414f5ff
+  data.tar.gz: cd78e46de0333fe3b769c42a9b3ccfcd0839774f3372693f786ad8f6de14f77d2033dcaf81da0811fb021673d92af6c529e8dbcf73d84070c05537c94607057e

data/bin/oneacct

@@ -16,36 +16,36 @@
 # 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
-    usage "`oneacct` [<options>]"
-    description ""
+CommandParser::CmdParser.new(ARGV) do
+    usage '`oneacct` [<options>]'
+    description ''
     version OpenNebulaHelper::ONE_VERSION
 
-    helper=OpenNebulaHelper::OneHelper.new
+    helper = OpenNebulaHelper::OneHelper.new
 
     before_proc do
         helper.set_client(options)
     end
 
     option AcctHelper::ACCT_OPTIONS + CommandParser::OPTIONS +
-        [OpenNebulaHelper::DESCRIBE, CLIHelper::LIST, CLIHelper::CSV_OPT] +
-        OpenNebulaHelper::CLIENT_OPTIONS
+           [OpenNebulaHelper::DESCRIBE, CLIHelper::LIST, CLIHelper::CSV_OPT] +
+           OpenNebulaHelper::CLIENT_OPTIONS
 
     main do
         if options[:describe]
@@ -54,18 +54,22 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
 
         filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
-        start_time  = options[:start_time] ? options[:start_time].to_i : -1
+        if options[:start_time]
+            start_time = options[:start_time].to_i
+        else
+            start_time = -1
+        end
 
         end_time = -1
 
-        if (!options[:end_time].nil?)
+        if !options[:end_time].nil?
             # Not the safest way to add a day, but since managing date/time
             # in ruby is... not entirely convenient, this will do
 
             t = options[:end_time]
 
-            if (t.hour == 0 && t.min == 0 && t.sec == 0)
-                t += 24*60*60
+            if t.hour.zero? && t.min.zero? && t.sec.zero?
+                t += 24 * 60 * 60
             end
 
             end_time = t.to_i
@@ -73,19 +77,19 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         common_opts = {
             :start_time => start_time,
-            :end_time   => end_time,
-            :host       => options[:host],
-            :group      => options[:group],
-            :xpath      => options[:xpath]
+            :end_time => end_time,
+            :host => options[:host],
+            :group => options[:group],
+            :xpath => options[:xpath]
         }
 
-        pool   = OpenNebula::VirtualMachinePool.new(helper.client)
+        pool = OpenNebula::VirtualMachinePool.new(helper.client)
 
         if options[:json] || options[:xml]
             xml_str = pool.accounting_xml(filter_flag, common_opts)
             if OpenNebula.is_error?(xml_str)
                 puts xml_str.message
-                exit -1
+                exit(-1)
             end
 
             if options[:json]
@@ -96,10 +100,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             elsif options[:xml]
                 puts xml_str
             end
-
-            exit_code 0
         else
-            order_by = Hash.new
+            order_by = {}
             order_by[:order_by_1] = 'VM/UID'
 
             if options[:split] && !options[:csv]
@@ -110,48 +112,48 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                                         common_opts.merge(order_by))
             if OpenNebula.is_error?(acct_hash)
                 puts acct_hash.message
-                exit -1
+                exit(-1)
             end
 
             if options[:csv]
-                a=Array.new
+                a = []
                 acct_hash.each do |user_id, value|
                     value['HISTORY_RECORDS']['HISTORY'].each do |l|
-                        l['UID']=user_id
+                        l['UID'] = user_id
                         a << l
                     end
                 end
 
-                cols = [ :UID ] + AcctHelper::ACCT_TABLE.default_columns
+                cols = [:UID] + AcctHelper::ACCT_TABLE.default_columns
                 options[:list] ||= cols
 
                 AcctHelper::ACCT_TABLE.show(a, options)
                 exit(0)
             end
 
-            if ( start_time != -1 or end_time != -1 )
+            if start_time != -1 || end_time != -1
                 AcctHelper.print_start_end_time_header(start_time, end_time)
             end
 
-            acct_hash.each { |user_id, value|
+            acct_hash.each do |user_id, value|
                 AcctHelper.print_user_header(user_id)
 
                 if options[:split]
                     # Use one table for each VM
-                    value.each { |vm_id, history_array|
+                    value.each  do |_vm_id, history_array|
                         array = history_array['HISTORY_RECORDS']['HISTORY']
                         AcctHelper::ACCT_TABLE.show(array, options)
                         puts
-                    }
+                    end
                 else
                     # Use the same table for all the VMs
                     array = value['HISTORY_RECORDS']['HISTORY']
                     AcctHelper::ACCT_TABLE.show(array, options)
                     puts
                 end
-            }
-
-            exit_code 0
+            end
         end
+
+        exit_code 0
     end
 end

data/bin/oneacl

@@ -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/oneacl_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`oneacl` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`oneacl` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneAclHelper.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
 
     ########################################################################
     # Formatters for arguments
@@ -60,7 +60,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Adds a new ACL rule
     EOT
 
-    command :create, addrule_desc, [:user,:rulestr], [:resource, nil],
+    command :create, addrule_desc, [:user, :rulestr], [:resource, nil],
             [:rights, nil] do
         case args.length
         when 1
@@ -70,9 +70,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 next -1, new_args.message
             end
         when 3, 4
-            new_args=args
+            new_args = args
         else
-            next -1, "Wrong number of arguments, must be 1 or 4"
+            next -1, 'Wrong number of arguments, must be 1 or 4'
         end
 
         helper.create_resource(options) do |rule|
@@ -85,7 +85,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delrule_desc, [:range] do
-        helper.perform_actions(args[0],options,"deleted") do |obj|
+        helper.perform_actions(args[0], options, 'deleted') do |obj|
             obj.delete
         end
     end
@@ -94,8 +94,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists the ACL rule set
     EOT
 
-    command :list, list_desc,:options=>[OpenNebulaHelper::XML,
-            OpenNebulaHelper::DESCRIBE] do
-        helper.list_pool( options )
+    command :list, list_desc, :options => [OpenNebulaHelper::XML,
+                                           OpenNebulaHelper::DESCRIBE] do
+        helper.list_pool(options)
     end
 end

data/bin/onecluster

@@ -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/onecluster_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onecluster` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onecluster` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneClusterHelper.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,17 +61,17 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.list_to_id(arg)
     end
 
-    set :format, :vnetid, OpenNebulaHelper.rname_to_id_desc("VNET") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "VNET")
+    set :format, :vnetid, OpenNebulaHelper.rname_to_id_desc('VNET') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'VNET')
     end
 
-    set :format, :hostid, OpenNebulaHelper.rname_to_id_desc("HOST") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "HOST")
+    set :format, :hostid, OpenNebulaHelper.rname_to_id_desc('HOST') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'HOST')
     end
 
     set :format, :datastoreid,
-            OpenNebulaHelper.rname_to_id_desc("DATASTORE") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "DATASTORE")
+        OpenNebulaHelper.rname_to_id_desc('DATASTORE') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'DATASTORE')
     end
 
     ########################################################################
@@ -93,7 +93,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :clusterid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |obj|
+        helper.perform_actions(args[0], options, 'deleted') do |obj|
             obj.delete
         end
     end
@@ -102,7 +102,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists Clusters 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
 
@@ -110,8 +110,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Cluster
     EOT
 
-    command :show, show_desc,:clusterid, :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+    command :show, show_desc, :clusterid, :options => OpenNebulaHelper::XML do
+        helper.show_resource(args[0], options)
     end
 
     addhost_desc = <<-EOT.unindent
@@ -119,8 +119,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     # TODO: allow the second param to be [:range, :hostid_list]
-    command :addhost, addhost_desc,:clusterid, :hostid do
-        helper.perform_action(args[0],options,"updated") do |cluster|
+    command :addhost, addhost_desc, :clusterid, :hostid do
+        helper.perform_action(args[0], options, 'updated') do |cluster|
             cluster.addhost(args[1].to_i)
         end
     end
@@ -131,7 +131,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     # TODO: allow the second param to be [:range, :hostid_list]
     command :delhost, delhost_desc, :clusterid, :hostid do
-        helper.perform_action(args[0],options,"updated") do |cluster|
+        helper.perform_action(args[0], options, 'updated') do |cluster|
             cluster.delhost(args[1].to_i)
         end
     end
@@ -141,8 +141,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     # TODO: allow the second param to be [:range, :datastoreid_list]
-    command :adddatastore, adddatastore_desc,:clusterid, :datastoreid do
-        helper.perform_action(args[0],options,"updated") do |cluster|
+    command :adddatastore, adddatastore_desc, :clusterid, :datastoreid do
+        helper.perform_action(args[0], options, 'updated') do |cluster|
             cluster.adddatastore(args[1].to_i)
         end
     end
@@ -153,7 +153,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     # TODO: allow the second param to be [:range, :datastoreid_list]
     command :deldatastore, deldatastore_desc, :clusterid, :datastoreid do
-        helper.perform_action(args[0],options,"updated") do |cluster|
+        helper.perform_action(args[0], options, 'updated') do |cluster|
             cluster.deldatastore(args[1].to_i)
         end
     end
@@ -163,8 +163,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     # TODO: allow the second param to be [:range, :vnetid_list]
-    command :addvnet, addvnet_desc,:clusterid, :vnetid do
-        helper.perform_action(args[0],options,"updated") do |cluster|
+    command :addvnet, addvnet_desc, :clusterid, :vnetid do
+        helper.perform_action(args[0], options, 'updated') do |cluster|
             cluster.addvnet(args[1].to_i)
         end
     end
@@ -174,8 +174,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     # TODO: allow the second param to be [:range, :vnetid_list]
-    command :delvnet, delvnet_desc,:clusterid, :vnetid do
-        helper.perform_action(args[0],options,"updated") do |cluster|
+    command :delvnet, delvnet_desc, :clusterid, :vnetid do
+        helper.perform_action(args[0], options, 'updated') do |cluster|
             cluster.delvnet(args[1].to_i)
         end
     end
@@ -186,8 +186,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :clusterid, [: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
@@ -206,7 +206,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :clusterid, :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

data/bin/onedatastore

@@ -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/onedatastore_helper'
 require 'one_helper/onecluster_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onedatastore` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onedatastore` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneDatastoreHelper.new
@@ -44,7 +44,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
@@ -63,16 +63,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     set :format, :clusterid,
-            OpenNebulaHelper.rname_to_id_desc("CLUSTER") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "CLUSTER")
+        OpenNebulaHelper.rname_to_id_desc('CLUSTER') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'CLUSTER')
     end
 
-    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
 
     ########################################################################
@@ -84,17 +84,17 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :create, create_desc, :file,
-            :options=>[OneClusterHelper::CLUSTER] do
+            :options => [OneClusterHelper::CLUSTER] do
 
         cid = options[:cluster] || ClusterPool::NONE_CLUSTER_ID
 
         helper.create_resource(options) do |datastore|
             begin
-                template=File.read(args[0])
+                template = File.read(args[0])
                 datastore.allocate(template, cid)
-            rescue =>e
+            rescue StandardError => e
                 STDERR.puts e.message
-                exit -1
+                exit(-1)
             end
         end
     end
@@ -104,7 +104,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :datastoreid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |obj|
+        helper.perform_actions(args[0], options, 'deleted') do |obj|
             obj.delete
         end
     end
@@ -113,8 +113,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Changes the Datastore group
     EOT
 
-    command :chgrp, chgrp_desc,[:range, :datastoreid_list], :groupid do
-        helper.perform_actions(args[0],options,"Group changed") do |obj|
+    command :chgrp, chgrp_desc, [:range, :datastoreid_list], :groupid do
+        helper.perform_actions(args[0], options, 'Group changed') do |obj|
             obj.chown(-1, args[1].to_i)
         end
     end
@@ -124,9 +124,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chown, chown_desc, [:range, :datastoreid_list], :userid,
-            [:groupid,nil] do
-        gid = args[2].nil? ? -1 : args[2].to_i
-        helper.perform_actions(args[0],options,"Owner/Group changed") do |obj|
+            [:groupid, nil] do
+        args[2].nil? ? gid = -1 : gid = args[2].to_i
+        helper.perform_actions(args[0], options, 'Owner/Group changed') do |obj|
             obj.chown(args[1].to_i, gid)
         end
     end
@@ -136,7 +136,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chmod, chmod_desc, [:range, :datastoreid_list], :octet do
-        helper.perform_actions(args[0],options, "Permissions changed") do |obj|
+        helper.perform_actions(args[0], options, 'Permissions changed') do |obj|
             obj.chmod_octet(args[1])
         end
     end
@@ -145,7 +145,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists Datastores 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
 
@@ -153,8 +153,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Datastore
     EOT
 
-    command :show, show_desc, :datastoreid, :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+    command :show, show_desc, :datastoreid, :options => OpenNebulaHelper::XML do
+        helper.show_resource(args[0], options)
     end
 
     update_desc = <<-EOT.unindent
@@ -163,8 +163,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :datastoreid, [: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
@@ -183,7 +183,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :datastoreid, :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
@@ -192,8 +192,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Enables the given Datastore. Only available for System Datastores
     EOT
 
-    command :enable, enable_desc, [:range,:datastoreid_list] do
-        helper.perform_actions(args[0],options,"enabled") do |obj|
+    command :enable, enable_desc, [:range, :datastoreid_list] do
+        helper.perform_actions(args[0], options, 'enabled') do |obj|
             obj.enable
         end
     end
@@ -202,8 +202,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Disables the given Datastore. Only available for System Datastores
     EOT
 
-    command :disable, disable_desc, [:range,:datastoreid_list] do
-        helper.perform_actions(args[0],options,"disabled") do |obj|
+    command :disable, disable_desc, [:range, :datastoreid_list] do
+        helper.perform_actions(args[0], options, 'disabled') do |obj|
             obj.disable
         end
     end