opennebula-cli 5.6.2 → 5.7.80.pre

data/bin/onevcenter

@@ -16,27 +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"
-    REMOTES_LOCATION="/var/lib/one/remotes/"
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    REMOTES_LOCATION = '/var/lib/one/remotes/'
 else
-    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
-    REMOTES_LOCATION=ONE_LOCATION+"/var/remotes/"
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    REMOTES_LOCATION = ONE_LOCATION + '/var/remotes/'
 end
 
-$: << RUBY_LIB_LOCATION
-$: << RUBY_LIB_LOCATION+"/cli"
-$: << REMOTES_LOCATION+"vmm/vcenter/"
+$LOAD_PATH << RUBY_LIB_LOCATION
+$LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
+$LOAD_PATH << REMOTES_LOCATION + 'vmm/vcenter/'
 
 require 'command_parser'
 require 'one_helper/onevcenter_helper'
 require 'vcenter_driver'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-
-    usage "`onevcenter` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onevcenter` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneVcenterHelper.new
@@ -45,83 +44,78 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.set_client(options)
     end
 
-
     OBJECT = {
-        :name => "object",
-        :short => "-o object",
-        :large => "--object object ",
+        :name => 'object',
+        :short => '-o object',
+        :large => '--object object ',
         :format => String,
-        :description => "vCenter object: [datastores, templates, networks, datastores, images]"
+        :description => 'vCenter object: [datastores, templates,'\
+                        'networks, datastores, images]'
     }
 
     HOST = {
-        :name => "host",
-        :short => "-h host_id",
-        :large => "--host host_id",
+        :name => 'host',
+        :short => '-h host_id',
+        :large => '--host host_id',
         :format => String,
-        :description => "OpenNebula host used to authenticate the operation"
+        :description => 'OpenNebula host used to authenticate the operation'
     }
 
     DATASTORE = {
-        :name => "datastore",
-        :short => "-d datastore_id",
-        :large => "--datastore datastore_id",
+        :name => 'datastore',
+        :short => '-d datastore_id',
+        :large => '--datastore datastore_id',
         :format => String,
-        :description => "OpenNebula datastore used"
+        :description => 'OpenNebula datastore used'
     }
 
     CONFIG = {
-        :name => "configuration",
-        :large => "--config file",
+        :name => 'configuration',
+        :large => '--config file',
         :format => String,
-        :description => "Configuration file for custom options"
+        :description => 'Configuration file for custom options'
     }
 
     VCENTER = {
-        :name   => "vcenter",
-        :large  => "--vcenter vCenter" ,
-        :description => "The vCenter hostname",
+        :name => 'vcenter',
+        :large => '--vcenter vCenter',
+        :description => 'The vCenter hostname',
         :format => String
     }
 
     USER = {
-        :name   => "vuser",
-        :large  => "--vuser username" ,
-        :description => "The username to interact with vCenter",
+        :name => 'vuser',
+        :large => '--vuser username',
+        :description => 'The username to interact with vCenter',
         :format => String
     }
 
     PASS = {
-        :name   => "vpass",
-        :large  => "--vpass password",
-        :description => "The password for the user",
+        :name => 'vpass',
+        :large => '--vpass password',
+        :description => 'The password for the user',
         :format => String
     }
 
     USE_DEFAULTS = {
-        :name   => "defaults",
-        :large  => "--use-defaults",
-        :description => "Use defaults for answers to questions",
+        :name => 'defaults',
+        :large => '--use-defaults',
+        :description => 'Use defaults for answers to questions',
         :format => String
     }
 
     ALL = {
-        :name   => "all",
-        :large  => "--all",
-        :description => "Import all list",
+        :name => 'all',
+        :large => '--all',
+        :description => 'Import all list',
         :format => String
     }
 
     ############################################################################
     # Global Options
     ############################################################################
-    cmd_options=CommandParser::OPTIONS-[CommandParser::VERBOSE]
-    set :option, cmd_options+OpenNebulaHelper::CLIENT_OPTIONS
-
-    #format :oid, "vCenter Object identifier" do |arg|
-    #    puts arg
-    #end
-
+    cmd_options = CommandParser::OPTIONS - [CommandParser::VERBOSE]
+    set :option, cmd_options + OpenNebulaHelper::CLIENT_OPTIONS
 
     ############################################################################
     # list resources
@@ -138,16 +132,20 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
              onevcenter list -o datastores -h <host_id> -d <ds-img_id>
     EOT
-    command :list, list_desc, :options=>[ OBJECT, HOST, DATASTORE, VCENTER, USER, PASS ] do
+
+    command :list,
+            list_desc,
+            :options => [OBJECT, HOST, DATASTORE, VCENTER, USER, PASS] do
         begin
             args = helper.parse_opts(options)
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
-            importer = VCenterDriver::VcImporter.new_child(helper.client, vi_client, options[:object])
+            importer = VCenterDriver::VcImporter
+                       .new_child(helper.client, vi_client, options[:object])
 
             list = importer.retrieve_resources(args)
 
             helper.list_object(options, list)
-        rescue Exception => e
+        rescue StandardError => e
             puts e.message
         end
 
@@ -171,11 +169,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
              onevcenter import 0..10 -o images -h <host_id> -d <ds-img_id>
     EOT
 
-    command :import, import_desc, [:oid, nil], :options=>[ OBJECT, HOST, DATASTORE ] do
-
+    command :import,
+            import_desc, [:oid, nil],
+            :options => [OBJECT, HOST, DATASTORE] do
         begin
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
-            importer = VCenterDriver::VcImporter.new_child(helper.client, vi_client, options[:object])
+            importer = VCenterDriver::VcImporter.new_child(helper.client,
+                                                           vi_client,
+                                                           options[:object])
 
             importer.retrieve_resources(helper.parse_opts(options))
             indexes = importer.get_indexes(args.first)
@@ -185,25 +186,29 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             end
 
             importer.stdout
-        rescue Exception => e
+        rescue StandardError => e
             puts e.message
         end
 
         exit 0
     end
 
-    command :import_defaults, import_desc, [:oid, nil] , :options=>[ OBJECT, HOST, DATASTORE, CONFIG ] do
-
+    command :import_defaults,
+            import_desc,
+            [:oid, nil],
+            :options => [OBJECT, HOST, DATASTORE, CONFIG] do
         begin
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
-            importer = VCenterDriver::VcImporter.new_child(helper.client, vi_client, options[:object])
+            importer = VCenterDriver::VcImporter.new_child(helper.client,
+                                                           vi_client,
+                                                           options[:object])
             importer.retrieve_resources(helper.parse_opts(options))
             indexes = importer.get_indexes(args.first)
 
             importer.process_import(indexes)
 
             importer.stdout
-        rescue Exception => e
+        rescue StandardError => e
             puts e.message
         end
 
@@ -221,12 +226,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
              onevcenter hosts --vcenter <vcenter> --vuser <vcenter_user> --vpass <password>
     EOT
-    command :hosts, host_desc, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
-        con_ops = helper.connection_options("Hosts", options)
+    command :hosts,
+            host_desc,
+            :options => [VCENTER, USER, PASS, USE_DEFAULTS] do
+        con_ops = helper.connection_options('Hosts', options)
 
-        VCenterDriver::Importer.import_clusters(con_ops, options)
+        VCenterDriver::VcImporter.import_clusters(con_ops, options)
 
         exit 0
     end
-
 end

data/bin/onevdc

@@ -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/onevdc_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onevdc` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onevdc` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneVdcHelper.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,51 +61,63 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         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, :zoneid, OpenNebulaHelper.rname_to_id_desc("ZONE") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "ZONE")
+    set :format, :zoneid, OpenNebulaHelper.rname_to_id_desc('ZONE') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'ZONE')
     end
 
     set :format, :clusterid,
-        "#{OpenNebulaHelper.rname_to_id_desc('CLUSTER')}. Can be set to ALL" do |arg|
+        "#{OpenNebulaHelper.rname_to_id_desc('CLUSTER')}. "\
+        'Can be set to ALL' do |arg|
 
-        if !arg.nil? and arg.class != Fixnum and arg.upcase == "ALL"
+        if !arg.nil? &&
+           arg.class != Integer &&
+           arg.casecmp('ALL').zero?
             [0, Vdc::ALL_RESOURCES]
         else
-            OpenNebulaHelper.rname_to_id(arg, "CLUSTER")
+            OpenNebulaHelper.rname_to_id(arg, 'CLUSTER')
         end
     end
 
     set :format, :hostid,
-        "#{OpenNebulaHelper.rname_to_id_desc('HOST')}. Can be set to ALL" do |arg|
+        "#{OpenNebulaHelper.rname_to_id_desc('HOST')}. "\
+        'Can be set to ALL' do |arg|
 
-        if !arg.nil? and arg.class != Fixnum and arg.upcase == "ALL"
+        if !arg.nil? &&
+           arg.class != Integer &&
+           arg.casecmp('ALL').zero?
             [0, Vdc::ALL_RESOURCES]
         else
-            OpenNebulaHelper.rname_to_id(arg, "HOST")
+            OpenNebulaHelper.rname_to_id(arg, 'HOST')
         end
     end
 
     set :format, :datastoreid,
-        "#{OpenNebulaHelper.rname_to_id_desc('DATASTORE')}. Can be set to ALL" do |arg|
+        "#{OpenNebulaHelper.rname_to_id_desc('DATASTORE')}. "\
+        'Can be set to ALL' do |arg|
 
-        if !arg.nil? and arg.class != Fixnum and arg.upcase == "ALL"
+        if !arg.nil? &&
+           arg.class != Integer &&
+           arg.casecmp('ALL').zero?
             [0, Vdc::ALL_RESOURCES]
         else
-            OpenNebulaHelper.rname_to_id(arg, "DATASTORE")
+            OpenNebulaHelper.rname_to_id(arg, 'DATASTORE')
         end
     end
 
     set :format, :vnetid,
-        "#{OpenNebulaHelper.rname_to_id_desc('VNET')}. Can be set to ALL" do |arg|
+        "#{OpenNebulaHelper.rname_to_id_desc('VNET')}. "\
+        'Can be set to ALL' do |arg|
 
-        if !arg.nil? and arg.class != Fixnum and arg.upcase == "ALL"
+        if !arg.nil? &&
+           arg.class != Integer &&
+           arg.casecmp('ALL').zero?
             [0, Vdc::ALL_RESOURCES]
         else
-            OpenNebulaHelper.rname_to_id(arg, "VNET")
+            OpenNebulaHelper.rname_to_id(arg, 'VNET')
         end
     end
 
@@ -129,7 +141,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :vdcid, :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
@@ -140,8 +152,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :vdcid, [: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
@@ -160,7 +172,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :vdcid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |obj|
+        helper.perform_actions(args[0], options, 'deleted') do |obj|
             obj.delete
         end
     end
@@ -170,7 +182,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :addgroup, add_group_desc, [:range, :vdcid_list], :groupid do
-        helper.perform_actions(args[0],options,"group added") do |obj|
+        helper.perform_actions(args[0], options, 'group added') do |obj|
             obj.add_group(args[1].to_i)
         end
     end
@@ -180,7 +192,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delgroup, del_group_desc, [:range, :vdcid_list], :groupid do
-        helper.perform_actions(args[0],options,"group deleted") do |obj|
+        helper.perform_actions(args[0], options, 'group deleted') do |obj|
             obj.del_group(args[1].to_i)
         end
     end
@@ -189,8 +201,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Adds a Cluster (from a specific Zone) to the given VDC
     EOT
 
-    command :addcluster, add_cluster_desc, [:range, :vdcid_list], :zoneid, :clusterid do
-        helper.perform_actions(args[0],options,"cluster added") do |obj|
+    command :addcluster, add_cluster_desc,
+            [:range, :vdcid_list], :zoneid, :clusterid do
+        helper.perform_actions(args[0], options, 'cluster added') do |obj|
             obj.add_cluster(args[1].to_i, args[2].to_i)
         end
     end
@@ -199,8 +212,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Deletes a Cluster (from a specific Zone) from the given VDC
     EOT
 
-    command :delcluster, del_cluster_desc, [:range, :vdcid_list], :zoneid, :clusterid do
-        helper.perform_actions(args[0],options,"cluster deleted") do |obj|
+    command :delcluster, del_cluster_desc,
+            [:range, :vdcid_list], :zoneid, :clusterid do
+        helper.perform_actions(args[0], options, 'cluster deleted') do |obj|
             obj.del_cluster(args[1].to_i, args[2].to_i)
         end
     end
@@ -210,7 +224,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :addhost, add_host_desc, [:range, :vdcid_list], :zoneid, :hostid do
-        helper.perform_actions(args[0],options,"host added") do |obj|
+        helper.perform_actions(args[0], options, 'host added') do |obj|
             obj.add_host(args[1].to_i, args[2].to_i)
         end
     end
@@ -220,7 +234,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delhost, del_host_desc, [:range, :vdcid_list], :zoneid, :hostid do
-        helper.perform_actions(args[0],options,"host deleted") do |obj|
+        helper.perform_actions(args[0], options, 'host deleted') do |obj|
             obj.del_host(args[1].to_i, args[2].to_i)
         end
     end
@@ -229,8 +243,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Adds a Datastore (from a specific Zone) to the given VDC
     EOT
 
-    command :adddatastore, add_datastore_desc, [:range, :vdcid_list], :zoneid, :datastoreid do
-        helper.perform_actions(args[0],options,"datastore added") do |obj|
+    command :adddatastore, add_datastore_desc,
+            [:range, :vdcid_list], :zoneid, :datastoreid do
+        helper.perform_actions(args[0], options, 'datastore added') do |obj|
             obj.add_datastore(args[1].to_i, args[2].to_i)
         end
     end
@@ -239,8 +254,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Deletes a Datastore (from a specific Zone) from the given VDC
     EOT
 
-    command :deldatastore, del_datastore_desc, [:range, :vdcid_list], :zoneid, :datastoreid do
-        helper.perform_actions(args[0],options,"datastore deleted") do |obj|
+    command :deldatastore, del_datastore_desc,
+            [:range, :vdcid_list], :zoneid, :datastoreid do
+        helper.perform_actions(args[0], options, 'datastore deleted') do |obj|
             obj.del_datastore(args[1].to_i, args[2].to_i)
         end
     end
@@ -250,7 +266,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :addvnet, add_vnet_desc, [:range, :vdcid_list], :zoneid, :vnetid do
-        helper.perform_actions(args[0],options,"vnet added") do |obj|
+        helper.perform_actions(args[0], options, 'vnet added') do |obj|
             obj.add_vnet(args[1].to_i, args[2].to_i)
         end
     end
@@ -260,7 +276,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delvnet, del_vnet_desc, [:range, :vdcid_list], :zoneid, :vnetid do
-        helper.perform_actions(args[0],options,"vnet deleted") do |obj|
+        helper.perform_actions(args[0], options, 'vnet deleted') do |obj|
             obj.del_vnet(args[1].to_i, args[2].to_i)
         end
     end
@@ -269,7 +285,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists VDCs 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
 
@@ -277,7 +293,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given VDC
     EOT
 
-    command :show, show_desc,:vdcid, :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+    command :show, show_desc, :vdcid, :options => OpenNebulaHelper::XML do
+        helper.show_resource(args[0], options)
     end
 end