opennebula-cli 6.0.0.2 → 6.0.1

data/bin/onevmgroup

@@ -26,25 +26,14 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
-# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -242,9 +231,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, [:range, :vmgroupid_list],
+    command :lock, lock_desc, :vmgroupid,
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_actions(args[0], options, 'VMGroup locked') do |vmg|
+        helper.perform_action(args[0], options, 'VMGroup locked') do |vmg|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -265,8 +254,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, [:range, :vmgroupid_list] do
-        helper.perform_actions(args[0], options, 'VMGroup unlocked') do |vmg|
+    command :unlock, unlock_desc, :vmgroupid do
+        helper.perform_action(args[0], options, 'VMGroup unlocked') do |vmg|
             vmg.unlock
         end
     end

data/bin/onevnet

@@ -26,25 +26,14 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
-# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -390,9 +379,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, [:range, :vnetid_list],
+    command :lock, lock_desc, :vnetid,
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_actions(args[0], options, 'VNet locked') do |vnet|
+        helper.perform_action(args[0], options, 'VNet locked') do |vnet|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -413,8 +402,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, [:range, :vnetid_list] do
-        helper.perform_actions(args[0], options, 'VNet unlocked') do |vnet|
+    command :unlock, unlock_desc, :vnetid do
+        helper.perform_action(args[0], options, 'VNet unlocked') do |vnet|
             vnet.unlock
         end
     end

data/bin/onevntemplate

@@ -26,25 +26,14 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
-# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -350,9 +339,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, [:range, :templateid_list],
+    command :lock, lock_desc, :templateid,
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_actions(args[0], options, 'VN Template locked') do |t|
+        helper.perform_action(args[0], options, 'VN Template locked') do |t|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -373,8 +362,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, [:range, :templateid_list] do
-        helper.perform_actions(args[0], options, 'VN Template unlocked') do |t|
+    command :unlock, unlock_desc, :templateid do
+        helper.perform_action(args[0], options, 'VN Template unlocked') do |t|
             t.unlock
         end
     end

data/bin/onevrouter

@@ -26,25 +26,14 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
-# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -375,9 +364,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, [:range, :vrouterid_list],
+    command :lock, lock_desc, :vrouterid,
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_actions(args[0], options, 'VRouter locked') do |vr|
+        helper.perform_action(args[0], options, 'VRouter locked') do |vr|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -398,8 +387,8 @@ CommandParser::CmdParser.new(ARGV) do
         valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, [:range, :vrouterid_list] do
-        helper.perform_actions(args[0], options, 'VRouter unlocked') do |vr|
+    command :unlock, unlock_desc, :vrouterid do
+        helper.perform_action(args[0], options, 'VRouter unlocked') do |vr|
             vr.unlock
         end
     end

data/bin/onezone

@@ -26,25 +26,14 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
-# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -265,7 +254,7 @@ CommandParser::CmdParser.new(ARGV) do
         end
 
         server = Replicator.new('/var/lib/one/.ssh/id_rsa', args[0])
-        server.process_files(options[:db])
+        server.process_files(options.key?(:database))
 
         0
     end

data/lib/one_helper.rb

@@ -710,8 +710,8 @@ EOT
                 elements, hash = print_page(pool, options)
 
                 if options[:ids] && elements
-                    hash = [hash[pool.pool_name][pool.element_name]].flatten
-                    hash.reject! do |element|
+                    arr = [hash[pool.pool_name][pool.element_name]].flatten
+                    arr.reject! do |element|
                         !options[:ids].include?(element['ID'].to_i)
                     end
                 end

data/lib/one_helper/onecluster_helper.rb

@@ -16,71 +16,73 @@
 
 require 'one_helper'
 
-# OneCluster CLI command helper
 class OneClusterHelper < OpenNebulaHelper::OneHelper
 
     CLUSTER = {
-        :name   => 'cluster',
-        :short  => '-c id|name',
-        :large  => '--cluster id|name',
-        :description => 'Selects the cluster',
+        :name   => "cluster",
+        :short  => "-c id|name",
+        :large  => "--cluster id|name" ,
+        :description => "Selects the cluster",
         :format => String,
-        :proc   => lambda {|o, _options|
-            OpenNebulaHelper.rname_to_id(o, 'CLUSTER')
+        :proc   => lambda { |o, options|
+            OpenNebulaHelper.rname_to_id(o, "CLUSTER")
         }
     }
 
     def self.rname
-        'CLUSTER'
+        "CLUSTER"
     end
 
     def self.conf_file
-        'onecluster.yaml'
+        "onecluster.yaml"
     end
 
     def element_size(ehash, ename)
-        ids = ehash[ename]['ID']
+        ids = ehash[ename]["ID"]
 
         if ids.nil?
-            0
+            return 0
         elsif ids.class == String
-            1
+            return 1
         else
-            ids.size
+            return ids.size
         end
     end
 
-    def format_pool(_options)
+
+    def format_pool(options)
         config_file = self.class.table_conf
 
-        CLIHelper::ShowTable.new(config_file, self) do
-            column :ID, 'ONE identifier for the Cluster', :size=>5 do |d|
-                d['ID']
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, "ONE identifier for the Cluster", :size=>5 do |d|
+                d["ID"]
             end
 
-            column :NAME, 'Name of the Cluster', :left, :size=>25 do |d|
-                d['NAME']
+            column :NAME, "Name of the Cluster", :left, :size=>25 do |d|
+                d["NAME"]
             end
 
-            column :HOSTS, 'Number of Hosts', :size=>5 do |d|
-                @ext.element_size(d, 'HOSTS') rescue 0
+            column :HOSTS, "Number of Hosts", :size=>5 do |d|
+                @ext.element_size(d,"HOSTS") rescue 0
             end
 
-            column :VNETS, 'Number of Networks', :size=>5 do |d|
-                @ext.element_size(d, 'VNETS') rescue 0
+            column :VNETS, "Number of Networks", :size=>5 do |d|
+                @ext.element_size(d,"VNETS") rescue 0
             end
 
-            column :DATASTORES, 'Number of Datastores', :size=>10 do |d|
-                @ext.element_size(d, 'DATASTORES') rescue 0
+            column :DATASTORES, "Number of Datastores", :size=>10 do |d|
+                @ext.element_size(d,"DATASTORES") rescue 0
             end
 
             default :ID, :NAME, :HOSTS, :VNETS, :DATASTORES
         end
+
+        table
     end
 
     private
 
-    def factory(id = nil)
+    def factory(id=nil)
         if id
             OpenNebula::Cluster.new_with_id(id, @client)
         else
@@ -89,74 +91,39 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
         end
     end
 
-    def factory_pool(_user_flag = -2)
+    def factory_pool(user_flag=-2)
         OpenNebula::ClusterPool.new(@client)
     end
 
-    def format_resource(cluster, _options = {})
-        str='%-18s: %-20s'
-        str_h1='%-80s'
+    def format_resource(cluster, options = {})
+        str="%-18s: %-20s"
+        str_h1="%-80s"
 
         CLIHelper.print_header(str_h1 % "CLUSTER #{cluster['ID']} INFORMATION")
-        puts format(str, 'ID', cluster.id.to_s)
-        puts format(str, 'NAME', cluster.name)
-
+        puts str % ["ID",   cluster.id.to_s]
+        puts str % ["NAME", cluster.name]
         puts
-        CLIHelper.print_header(str_h1 % 'CLUSTER RESOURCES', false)
-        cluster.info!
-
-        hosts = cluster.to_hash['CLUSTER']['HOSTS']['ID']
-
-        if hosts
-            total_cpu = 0
-            used_cpu  = 0
-            total_ram = 0
-            used_ram  = 0
-
-            [hosts].flatten.each do |h|
-                h = OpenNebula::Host.new_with_id(h, @client)
-
-                h.info!
-
-                h = h.to_hash
-                h = h['HOST']['HOST_SHARE']
 
-                total_cpu += h['TOTAL_CPU'].to_i / 100
-                used_cpu  += h['CPU_USAGE'].to_i / 100
-                total_ram += h['TOTAL_MEM'].to_i / 1024 / 1024
-                used_ram  += h['MEM_USAGE'].to_i / 1024 / 1024
-            end
-
-            puts "TOTAL CPUs: #{total_cpu}"
-            puts "OCCUPIED CPUs: #{used_cpu}"
-            puts "AVAILABLE CPUs: #{total_cpu - used_cpu}"
-            puts
-            puts "TOTAL RAM: #{total_ram}"
-            puts "OCCUPIED RAM: #{used_ram}"
-            puts "AVAILABLE RAM: #{total_ram - used_ram}"
-        end
-
-        puts
-        CLIHelper.print_header(str_h1 % 'CLUSTER TEMPLATE', false)
+        CLIHelper.print_header(str_h1 % "CLUSTER TEMPLATE", false)
         puts cluster.template_str
 
         puts
-        CLIHelper.print_header(format('%-15s', 'HOSTS'))
+
+        CLIHelper.print_header("%-15s" % ["HOSTS"])
         cluster.host_ids.each do |id|
-            puts format('%-15s', id)
+            puts "%-15s" % [id]
         end
 
         puts
-        CLIHelper.print_header(format('%-15s', 'VNETS'))
+        CLIHelper.print_header("%-15s" % ["VNETS"])
         cluster.vnet_ids.each do |id|
-            puts format('%-15s', id)
+            puts "%-15s" % [id]
         end
 
         puts
-        CLIHelper.print_header(format('%-15s', 'DATASTORES'))
+        CLIHelper.print_header("%-15s" % ["DATASTORES"])
         cluster.datastore_ids.each do |id|
-            puts format('%-15s', id)
+            puts "%-15s" % [id]
         end
     end
-
 end

data/lib/one_helper/onevm_helper.rb

@@ -1086,26 +1086,6 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
         end
 
-        if vm_hash['VM']['TEMPLATE']['NIC']
-            nic = [vm_hash['VM']['TEMPLATE']['NIC']]
-            nic = nic.flatten
-            nic = nic.select {|v| !v['EXTERNAL_PORT_RANGE'].nil? }[0]
-
-            if nic
-                ip   = vm_hash['VM']['HISTORY_RECORDS']['HISTORY']
-                ip   = [ip].flatten[-1]['HOSTNAME']
-                port = Integer(nic['EXTERNAL_PORT_RANGE'].split(':')[0]) + 21
-
-                puts
-                CLIHelper.print_header(str_h1 % 'PORT FORWARD', false)
-
-                puts "[#{nic['EXTERNAL_PORT_RANGE']}]:" \
-                     "[#{nic['INTERNAL_PORT_RANGE'].split('/')[0]}]"
-
-                puts "SSH on #{ip} at port #{port}"
-            end
-        end
-
         if !options[:all]
             while vm.has_elements?('/VM/TEMPLATE/NIC')
                 vm.delete_element('/VM/TEMPLATE/NIC')