opennebula-cli 5.6.2 → 5.7.80.pre

data/bin/onemarketapp

@@ -16,26 +16,26 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-ONE_LOCATION=ENV["ONE_LOCATION"]
+ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
-    RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
-    VAR_LOCATION      = "/var/lib/one"
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    VAR_LOCATION      = '/var/lib/one'
 else
-    RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
-    VAR_LOCATION      = ONE_LOCATION + "/var"
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    VAR_LOCATION      = ONE_LOCATION + '/var'
 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/onemarketapp_helper'
 require 'one_helper/onemarket_helper'
 require 'one_helper/onedatastore_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 = OneMarketPlaceAppHelper.new
@@ -44,34 +44,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
@@ -79,17 +79,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     list_options << OpenNebulaHelper::DESCRIBE
 
     CREATE_OPTIONS = [OneMarketPlaceHelper::MARKETPLACE]
-    EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE, OneMarketPlaceAppHelper::VMNAME]
+    EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE,
+                      OneMarketPlaceAppHelper::VMNAME]
 
     ########################################################################
     # 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, :appid, OneMarketPlaceAppHelper.to_id_desc do |arg|
@@ -100,7 +101,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.list_to_id(arg)
     end
 
-    set :format, :filterflag, OneMarketPlaceAppHelper.filterflag_to_i_desc do |arg|
+    set :format, :filterflag,
+        OneMarketPlaceAppHelper.filterflag_to_i_desc do |arg|
         helper.filterflag_to_i(arg)
     end
 
@@ -112,27 +114,30 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Creates a new marketplace app in the given marketplace
     EOT
 
-    command :create, create_desc, [:file, nil], :options=>CREATE_OPTIONS +
-            OneMarketPlaceAppHelper::TEMPLATE_OPTIONS do
+    command :create, create_desc, [:file, nil],
+            :options => CREATE_OPTIONS +
+                        OneMarketPlaceAppHelper::TEMPLATE_OPTIONS do
 
         if options[:marketplace].nil?
-            STDERR.puts "Marketplace to save the app is mandatory: "
-            STDERR.puts "\t -m marketplace_id"
+            STDERR.puts 'Marketplace to save the app is mandatory: '
+            STDERR.puts '\t -m marketplace_id'
             exit(-1)
         end
 
-        if args[0] && OneMarketPlaceAppHelper.create_template_options_used?(options)
-            STDERR.puts "You can not use both template file and template"<<
-                " creation options."
+        if args[0] &&
+           OneMarketPlaceAppHelper.create_template_options_used?(options)
+            STDERR.puts 'You can not use both template file and template'\
+                        ' creation options.'
             next -1
         end
 
         helper.create_resource(options) do |app|
             begin
                 if args[0]
-                    template=File.read(args[0])
+                    template = File.read(args[0])
                 else
-                    res = OneMarketPlaceAppHelper.create_datastore_template(options)
+                    res = OneMarketPlaceAppHelper
+                          .create_datastore_template(options)
 
                     if res.first != 0
                         STDERR.puts res.last
@@ -148,7 +153,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 end
 
                 app.allocate(template, options[:marketplace])
-            rescue => e
+            rescue StandardError => e
                 STDERR.puts e.message
                 exit(-1)
             end
@@ -159,27 +164,26 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Exports the marketplace app to the OpenNebula cloud
     EOT
 
-    command :export, export_desc, :appid, :name, :options=>EXPORT_OPTIONS  do
-        helper.perform_action(args[0], options, "exported") do |obj|
-
-            rc = obj.export({
-                :dsid=>options[:datastore],
-                :name=>args[1],
-                :vmtemplate_name=>options[:vmname]
-            })
+    command :export, export_desc, :appid, :name, :options => EXPORT_OPTIONS do
+        helper.perform_action(args[0], options, 'exported') do |obj|
+            rc = obj.export(
+                :dsid => options[:datastore],
+                :name => args[1],
+                :vmtemplate_name => options[:vmname]
+            )
 
             next rc if OpenNebula.is_error?(rc)
 
-            rc.each { |key, value|
-                puts "#{key.to_s.upcase}"
-                value.each{ |id|
+            rc.each  do |key, value|
+                puts key.to_s.upcase
+                value.each do |id|
                     if OpenNebula.is_error?(id)
                         puts id.to_str
                     else
                         puts "    ID: #{id}"
                     end
-                }
-            }
+                end
+            end
         end
     end
 
@@ -188,8 +192,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :download, download_desc, :appid, :path,
-        :options => [OpenNebulaHelper::FORCE] do
-        helper.perform_action(args[0],options,"downloaded") do |app|
+            :options => [OpenNebulaHelper::FORCE] do
+        helper.perform_action(args[0], options, 'downloaded') do
             download_args = [:marketplaceapp, args[0], args[1], options[:force]]
             OpenNebulaHelper.download_resource_sunstone(*download_args)
         end
@@ -200,7 +204,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :appid_list] do
-        helper.perform_actions(args[0], options, "deleted") do |app|
+        helper.perform_actions(args[0], options, 'deleted') do |app|
             app.delete
         end
     end
@@ -211,9 +215,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :appid, [:file, nil],
-        :options=>OpenNebulaHelper::APPEND do
+            :options => OpenNebulaHelper::APPEND do
 
-        helper.perform_action(args[0],options,"modified") do |obj|
+        helper.perform_action(args[0], options, 'modified') do |obj|
             if options[:append]
                 str = OpenNebulaHelper.append_template(args[0], obj, args[1])
             else
@@ -228,8 +232,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Changes the marketplace app group
     EOT
 
-    command :chgrp, chgrp_desc,[:range, :appid_list], :groupid do
-        helper.perform_actions(args[0], options, "Group changed") do |app|
+    command :chgrp, chgrp_desc, [:range, :appid_list], :groupid do
+        helper.perform_actions(args[0], options, 'Group changed') do |app|
             app.chown(-1, args[1].to_i)
         end
     end
@@ -240,9 +244,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :chown, chown_desc, [:range, :appid_list], :userid,
             [:groupid, nil] do
-        gid = args[2].nil? ? -1 : args[2].to_i
+        args[2].nil? ? gid = -1 : gid = args[2].to_i
 
-        helper.perform_actions(args[0], options, "Owner/Group changed") do |app|
+        helper.perform_actions(args[0], options, 'Owner/Group changed') do |app|
             app.chown(args[1].to_i, gid)
         end
     end
@@ -252,7 +256,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chmod, chmod_desc, [:range, :appid_list], :octet do
-        helper.perform_actions(args[0], options, "Permissions changed") do |app|
+        helper.perform_actions(args[0], options, 'Permissions changed') do |app|
             app.chmod_octet(args[1])
         end
     end
@@ -262,7 +266,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :appid, :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
@@ -271,7 +275,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists marketplace apps
     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
 
@@ -279,7 +283,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given marketplace app
     EOT
 
-    command :show, show_desc, :appid, :options=>OpenNebulaHelper::XML do
+    command :show, show_desc, :appid, :options => OpenNebulaHelper::XML do
         helper.show_resource(args[0], options)
     end
 
@@ -288,7 +292,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :enable, enable_desc, [:range, :appid_list] do
-        helper.perform_actions(args[0], options, "enabled") do |obj|
+        helper.perform_actions(args[0], options, 'enabled') do |obj|
             obj.enable
         end
     end
@@ -299,14 +303,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :disable, disable_desc, [:range, :appid_list] do
-        helper.perform_actions(args[0], options, "disabled") do |obj|
+        helper.perform_actions(args[0], options, 'disabled') do |obj|
             obj.disable
         end
     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.
@@ -315,8 +319,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :lock, lock_desc, :appid,
-        :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0],options,"MarketPlaceApp locked") do |app|
+            :options => [USE, MANAGE, ADMIN, ALL] do
+        helper.perform_action(args[0],
+                              options,
+                              'MarketPlaceApp locked') do |app|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -338,7 +344,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :unlock, unlock_desc, :appid do
-        helper.perform_action(args[0],options,"MarketPlaceApp unlocked") do |app|
+        helper.perform_action(args[0],
+                              options,
+                              'MarketPlaceApp unlocked') do |app|
             app.unlock
         end
     end

data/bin/onesecgroup

@@ -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/onesecgroup_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onesecgroup` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onesecgroup` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneSecurityGroupHelper.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
@@ -53,23 +53,27 @@ 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, :secgroupid, OneSecurityGroupHelper.to_id_desc do |arg|
         helper.to_id(arg)
     end
 
-    set :format, :secgroupid_list, OneSecurityGroupHelper.list_to_id_desc do |arg|
+    set :format,
+        :secgroupid_list,
+        OneSecurityGroupHelper.list_to_id_desc do |arg|
         helper.list_to_id(arg)
     end
 
-    set :format, :filterflag, OneSecurityGroupHelper.filterflag_to_i_desc do |arg|
+    set :format,
+        :filterflag,
+        OneSecurityGroupHelper.filterflag_to_i_desc do |arg|
         helper.filterflag_to_i(arg)
     end
 
@@ -87,9 +91,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 template = File.read(args[0])
 
                 obj.allocate(template)
-            rescue => e
+            rescue StandardError => e
                 STDERR.puts e.messsage
-                exit -1
+                exit(-1)
             end
         end
     end
@@ -99,7 +103,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :clone, clone_desc, :secgroupid, :name do
-        helper.perform_action(args[0],options,"cloned") do |obj|
+        helper.perform_action(args[0], options, 'cloned') do |obj|
             res = obj.clone(args[1])
 
             if !OpenNebula.is_error?(res)
@@ -115,7 +119,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :secgroupid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |obj|
+        helper.perform_actions(args[0], options, 'deleted') do |obj|
             obj.delete
         end
     end
@@ -124,8 +128,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Changes the Security Group's group
     EOT
 
-    command :chgrp, chgrp_desc,[:range, :secgroupid_list], :groupid do
-        helper.perform_actions(args[0],options,"Group changed") do |obj|
+    command :chgrp, chgrp_desc, [:range, :secgroupid_list], :groupid do
+        helper.perform_actions(args[0], options, 'Group changed') do |obj|
             obj.chown(-1, args[1].to_i)
         end
     end
@@ -135,9 +139,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chown, chown_desc, [:range, :secgroupid_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
@@ -147,7 +151,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chmod, chmod_desc, [:range, :secgroupid_list], :octet do
-        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])
         end
     end
@@ -158,8 +162,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :secgroupid, [: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
@@ -178,7 +182,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :secgroupid, :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
@@ -191,9 +195,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :commit, commit_desc, :secgroupid,
-        :options =>[OneSecurityGroupHelper::RECOVER] do
-        helper.perform_action(args[0], options, "commit") do |o|
-            o.commit(options[:recover]==true)
+            :options => [OneSecurityGroupHelper::RECOVER] do
+        helper.perform_action(args[0], options, 'commit') do |o|
+            o.commit(options[:recover] == true)
         end
     end
 
@@ -201,7 +205,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists Security Group 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
 
@@ -209,7 +213,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Security Group
     EOT
 
-    command :show, show_desc, :secgroupid, :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+    command :show, show_desc, :secgroupid, :options => OpenNebulaHelper::XML do
+        helper.show_resource(args[0], options)
     end
 end