opennebula-cli 5.6.2 → 5.7.80.pre

data/bin/oneimage

@@ -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/oneimage_helper'
 require 'one_helper/onedatastore_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`oneimage` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`oneimage` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneImageHelper.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,12 +80,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     ########################################################################
     # 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, :imageid, OneImageHelper.to_id_desc do |arg|
@@ -100,13 +100,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.filterflag_to_i(arg)
     end
 
-    format(:type, "Image type: #{Image::IMAGE_TYPES.join(", ")}") do |arg|
-        type=arg.strip.upcase
+    format(:type, "Image type: #{Image::IMAGE_TYPES.join(', ')}") do |arg|
+        type = arg.strip.upcase
         if Image::IMAGE_TYPES.include? type
             [0, type]
         else
-            [1, "Image type not supported. Must be "<<
-                 Image::IMAGE_TYPES.join(", ")<<"."]
+            [1, 'Image type not supported. Must be ' <<
+                Image::IMAGE_TYPES.join(', ') << '.']
         end
     end
 
@@ -138,27 +138,33 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     EOT
 
-    command :create, create_desc, [:file, nil], :options=>CREATE_OPTIONS +
-            OneImageHelper::TEMPLATE_OPTIONS do
+    command :create,
+            create_desc,
+            [:file, nil],
+            :options => CREATE_OPTIONS + OneImageHelper::TEMPLATE_OPTIONS do
 
         if options[:datastore].nil? && !options[:dry]
-            STDERR.puts "Datastore to save the image is mandatory: "
-            STDERR.puts "\t -d datastore_id"
-            exit -1
+            STDERR.puts 'Datastore to save the image is mandatory: '
+            STDERR.puts '\t -d datastore_id'
+            exit(-1)
         end
 
-        check_capacity = options[:no_check_capacity].nil? ? false : true;
+        if options[:no_check_capacity].nil?
+            check_capacity = false
+        else
+            check_capacity = true
+        end
 
         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
 
         helper.create_resource(options) do |image|
             begin
                 if args[0]
-                    template=File.read(args[0])
+                    template = File.read(args[0])
                 else
                     res = OneImageHelper.create_image_template(options)
 
@@ -176,9 +182,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 end
 
                 image.allocate(template, options[:datastore], check_capacity)
-            rescue => e
+            rescue StandardError => e
                 STDERR.puts e.messsage
-                exit -1
+                exit(-1)
             end
         end
     end
@@ -188,8 +194,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :clone, clone_desc, :imageid, :name,
-        :options=>[OneDatastoreHelper::DATASTORE] do
-        helper.perform_action(args[0],options,"cloned") do |image|
+            :options => [OneDatastoreHelper::DATASTORE] do
+        helper.perform_action(args[0], options, 'cloned') do |image|
             ds_id = options[:datastore] || -1 # -1 clones to self
             res   = image.clone(args[1], ds_id)
 
@@ -197,7 +203,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 puts "ID: #{res}"
             else
                 puts res.message
-                exit -1
+                exit(-1)
             end
         end
     end
@@ -207,7 +213,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :imageid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |image|
+        helper.perform_actions(args[0], options, 'deleted') do |image|
             image.delete
         end
     end
@@ -219,8 +225,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         one VM instance at a time.
     EOT
 
-    command :persistent, persistent_desc, [:range,:imageid_list] do
-        helper.perform_actions(args[0],options,"made persistent") do |image|
+    command :persistent, persistent_desc, [:range, :imageid_list] do
+        helper.perform_actions(args[0], options, 'made persistent') do |image|
             image.persistent
         end
     end
@@ -229,8 +235,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Makes the given Image non persistent. See 'oneimage persistent'
     EOT
 
-    command :nonpersistent, nonpersistent_desc, [:range,:imageid_list] do
-        helper.perform_actions(args[0],options,"made non persistent") do |image|
+    command :nonpersistent, nonpersistent_desc, [:range, :imageid_list] do
+        helper.perform_actions(args[0],
+                               options,
+                               'made non persistent') do |image|
             image.nonpersistent
         end
     end
@@ -241,8 +249,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :imageid, [: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
@@ -260,8 +268,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Enables the given Image
     EOT
 
-    command :enable, enable_desc, [:range,:imageid_list] do
-        helper.perform_actions(args[0],options,"enabled") do |image|
+    command :enable, enable_desc, [:range, :imageid_list] do
+        helper.perform_actions(args[0], options, 'enabled') do |image|
             image.enable
         end
     end
@@ -270,8 +278,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Changes the Image's type
     EOT
 
-    command :chtype, chtype_desc,[:range, :imageid_list], :type do
-        helper.perform_actions(args[0],options,"Type changed") do |image|
+    command :chtype, chtype_desc, [:range, :imageid_list], :type do
+        helper.perform_actions(args[0], options, 'Type changed') do |image|
             image.chtype(args[1])
         end
     end
@@ -280,8 +288,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Disables the given Image
     EOT
 
-    command :disable, disable_desc, [:range,:imageid_list] do
-        helper.perform_actions(args[0],options,"disabled") do |image|
+    command :disable, disable_desc, [:range, :imageid_list] do
+        helper.perform_actions(args[0], options, 'disabled') do |image|
             image.disable
         end
     end
@@ -290,8 +298,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Changes the Image group
     EOT
 
-    command :chgrp, chgrp_desc,[:range, :imageid_list], :groupid do
-        helper.perform_actions(args[0],options,"Group changed") do |image|
+    command :chgrp, chgrp_desc, [:range, :imageid_list], :groupid do
+        helper.perform_actions(args[0], options, 'Group changed') do |image|
             image.chown(-1, args[1].to_i)
         end
     end
@@ -301,10 +309,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chown, chown_desc, [:range, :imageid_list], :userid,
-            [:groupid,nil] do
-        gid = args[2].nil? ? -1 : args[2].to_i
-        helper.perform_actions(args[0],options,
-                "Owner/Group changed") do |image|
+            [:groupid, nil] do
+        args[2].nil? ? gid = -1 : gid = args[2].to_i
+        helper.perform_actions(args[0], options,
+                               'Owner/Group changed') do |image|
             image.chown(args[1].to_i, gid)
         end
     end
@@ -314,8 +322,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chmod, chmod_desc, [:range, :imageid_list], :octet do
-        helper.perform_actions(args[0],options,
-                "Permissions changed") do |image|
+        helper.perform_actions(args[0], options,
+                               'Permissions changed') do |image|
             image.chmod_octet(args[1])
         end
     end
@@ -325,7 +333,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :imageid, :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
@@ -334,8 +342,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Deletes a snapshot from the image
     EOT
 
-    command :"snapshot-delete", snapshot_delete_desc, :imageid, :snapshot_id do
-        helper.perform_action(args[0], options, "snapshot deleted") do |o|
+    command :'snapshot-delete', snapshot_delete_desc, :imageid, :snapshot_id do
+        helper.perform_action(args[0], options, 'snapshot deleted') do |o|
             o.snapshot_delete(args[1].to_i)
         end
     end
@@ -344,8 +352,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Reverts image state to a snapshot
     EOT
 
-    command :"snapshot-revert", snapshot_revert_desc, :imageid, :snapshot_id do
-        helper.perform_action(args[0], options, "image state reverted") do |o|
+    command :'snapshot-revert', snapshot_revert_desc, :imageid, :snapshot_id do
+        helper.perform_action(args[0], options, 'image state reverted') do |o|
             o.snapshot_revert(args[1].to_i)
         end
     end
@@ -354,8 +362,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Flattens the snapshot and removes all other snapshots in the image
     EOT
 
-    command :"snapshot-flatten", snapshot_flatten_desc, :imageid, :snapshot_id do
-        helper.perform_action(args[0], options, "snapshot flattened") do |o|
+    command :'snapshot-flatten',
+            snapshot_flatten_desc,
+            :imageid,
+            :snapshot_id do
+        helper.perform_action(args[0], options, 'snapshot flattened') do |o|
             o.snapshot_flatten(args[1].to_i)
         end
     end
@@ -364,7 +375,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists Images in the pool
     EOT
 
-    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
 
@@ -372,15 +383,15 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Image
     EOT
 
-    command :show, show_desc, :imageid, :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+    command :show, show_desc, :imageid, :options => OpenNebulaHelper::XML do
+        helper.show_resource(args[0], options)
     end
 
     top_desc = <<-EOT.unindent
         Lists Images 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
 
@@ -395,8 +406,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :lock, lock_desc, :imageid,
-        :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0],options,"Image locked") do |i|
+            :options => [USE, MANAGE, ADMIN, ALL] do
+        helper.perform_action(args[0], options, 'Image locked') do |i|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -418,7 +429,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :unlock, unlock_desc, :imageid do
-        helper.perform_action(args[0],options,"Image unlocked") do |i|
+        helper.perform_action(args[0], options, 'Image unlocked') do |i|
             i.unlock
         end
     end

data/bin/onemarket

@@ -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/onemarket_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onemarket` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onemarket` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneMarketPlaceHelper.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
@@ -57,16 +57,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.to_id(arg)
     end
 
-    set :format, :marketplaceid_list, OneMarketPlaceHelper.list_to_id_desc do |arg|
+    set :format,
+        :marketplaceid_list,
+        OneMarketPlaceHelper.list_to_id_desc do |arg|
         helper.list_to_id(arg)
     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
 
     ########################################################################
@@ -78,14 +80,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :create, create_desc, :file do
-
         helper.create_resource(options) do |marketplace|
             begin
                 template = File.read(args[0])
                 marketplace.allocate(template)
-            rescue =>e
+            rescue StandardError => e
                 STDERR.puts e.message
-                exit -1
+                exit(-1)
             end
         end
     end
@@ -95,7 +96,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :marketplaceid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |obj|
+        helper.perform_actions(args[0], options, 'deleted') do |obj|
             obj.delete
         end
     end
@@ -104,8 +105,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Changes the Marketplace group
     EOT
 
-    command :chgrp, chgrp_desc,[:range, :marketplaceid_list], :groupid do
-        helper.perform_actions(args[0],options,"Group changed") do |obj|
+    command :chgrp, chgrp_desc, [:range, :marketplaceid_list], :groupid do
+        helper.perform_actions(args[0], options, 'Group changed') do |obj|
             obj.chown(-1, args[1].to_i)
         end
     end
@@ -115,9 +116,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chown, chown_desc, [:range, :marketplaceid_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
@@ -127,7 +128,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chmod, chmod_desc, [:range, :marketplaceid_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
@@ -136,7 +137,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists Marketplaces
     EOT
 
-    command :list, list_desc, :options=>list_options do
+    command :list, list_desc, :options => list_options do
         helper.list_pool(options)
     end
 
@@ -144,8 +145,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows Marketplace information
     EOT
 
-    command :show, show_desc, :marketplaceid, :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+    command :show, show_desc,
+            :marketplaceid, :options => OpenNebulaHelper::XML do
+        helper.show_resource(args[0], options)
     end
 
     update_desc = <<-EOT.unindent
@@ -154,8 +156,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :marketplaceid, [: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
@@ -171,7 +173,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :marketplaceid, :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