From 175e9456ce615bdb8e645248fc8f4ebdbf9d35de Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 26 Nov 2018 11:45:37 +0100 Subject: [PATCH] Remove linting offenses --- src/cli/onevdc | 8 ++++---- src/cli/onevntemplate | 16 ++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/cli/onevdc b/src/cli/onevdc index d3369175b7..01d994ae89 100755 --- a/src/cli/onevdc +++ b/src/cli/onevdc @@ -75,7 +75,7 @@ CommandParser::CmdParser.new(ARGV) do if !arg.nil? && arg.class != Integer && - arg.upcase == "ALL" + arg.casecmp('ALL').zero? [0, Vdc::ALL_RESOURCES] else OpenNebulaHelper.rname_to_id(arg, 'CLUSTER') @@ -88,7 +88,7 @@ CommandParser::CmdParser.new(ARGV) do if !arg.nil? && arg.class != Integer && - arg.upcase == "ALL" + arg.casecmp('ALL').zero? [0, Vdc::ALL_RESOURCES] else OpenNebulaHelper.rname_to_id(arg, 'HOST') @@ -101,7 +101,7 @@ CommandParser::CmdParser.new(ARGV) do if !arg.nil? && arg.class != Integer && - arg.upcase == "ALL" + arg.casecmp('ALL').zero? [0, Vdc::ALL_RESOURCES] else OpenNebulaHelper.rname_to_id(arg, 'DATASTORE') @@ -114,7 +114,7 @@ CommandParser::CmdParser.new(ARGV) do if !arg.nil? && arg.class != Integer && - arg.upcase == "ALL" + arg.casecmp('ALL').zero? [0, Vdc::ALL_RESOURCES] else OpenNebulaHelper.rname_to_id(arg, 'VNET') diff --git a/src/cli/onevntemplate b/src/cli/onevntemplate index 998f7e48cb..fa878326c2 100755 --- a/src/cli/onevntemplate +++ b/src/cli/onevntemplate @@ -43,25 +43,25 @@ CommandParser::CmdParser.new(ARGV) do end USE = { - :name => 'use', + :name => 'use', :large => '--use', :description => 'lock use actions' } MANAGE = { - :name => 'manage', + :name => 'manage', :large => '--manage', :description => 'lock manage actions' } ADMIN = { - :name => 'admin', + :name => 'admin', :large => '--admin', :description => 'lock admin actions' } ALL = { - :name => 'all', + :name => 'all', :large => '--all', :description => 'lock all actions' } @@ -148,7 +148,6 @@ CommandParser::CmdParser.new(ARGV) do EOT command :clone, clone_desc, :templateid, :name do - helper.perform_action(args[0], options, 'cloned') do |t| res = t.clone(args[1]) @@ -165,9 +164,8 @@ CommandParser::CmdParser.new(ARGV) do EOT command :delete, delete_desc, [:range, :templateid_list] do - helper.perform_actions(args[0], options, 'deleted') do |t| - t.delete() + t.delete end end @@ -184,7 +182,6 @@ CommandParser::CmdParser.new(ARGV) do exit_code = 0 number = options[:multiple] || 1 - user_inputs = nil number.times do |i| exit_code = helper.perform_action(args[0], options, @@ -216,7 +213,7 @@ CommandParser::CmdParser.new(ARGV) do extra_template << OpenNebulaHelper.create_ar(options) end end - + res = t.instantiate(name, extra_template) if !OpenNebula.is_error?(res) @@ -259,7 +256,6 @@ CommandParser::CmdParser.new(ARGV) do EOT command :chmod, chmod_desc, [:range, :templateid_list], :octet do - recursive = (options[:recursive] == true) helper.perform_actions(args[0], options, 'Permissions changed') do |t|