opennebula-cli 5.11.90.pre → 5.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f9d505a4c075609888337b302394b8ad09f564
-  data.tar.gz: 5f91c8dd57ee2e6ebe71f6a5563d289e68ed97ee
+  metadata.gz: c983e27446fa44ae16be7dd9ab0edc0088a60ada
+  data.tar.gz: 88f7040d5528afa511e6838cf210fa20d90e4881
 SHA512:
-  metadata.gz: 45a4ca86499b26e4f8d94178384b7266da3764e0c0169226b1b8f3e582ba09298b01387f852dea0b9d05e66420ea74a2ee84295101aca55366d9adfa92d402e6
-  data.tar.gz: 547591723faffe0aa33786c3f4ee863576348a618e30ede74df643e98c664afca036dae467f277cce9ef3f063f93391e64ae5e48123156968769ab0e255c6244
+  metadata.gz: dbe1aa18b032fff185982ea8569494f8bde7a12abcadad9c4b47107661f845c11711c3cf4c252be9ce9800f31477d6a5fb7865d59864f356511dbcff9b3f90cb
+  data.tar.gz: 8f163f00d441e0cbce141ea40f0f5c4478e239ec85fa655055e5ca5d23c099a43d277b8a92223af5d70d119e420fe83a123a883125813ce35a983ba3b3ce0b09

data/bin/oneacct

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneacl

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onecluster

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onedatastore

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneflow

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneflow-template

@@ -29,8 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onegroup

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onehook

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onehost

@@ -29,8 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -97,6 +98,52 @@ CommandParser::CmdParser.new(ARGV) do
     CREAT_OPTIONS = [IM, VMM, OneClusterHelper::CLUSTER, TYPE]
     SYNC_OPTIONS  = [OneClusterHelper::CLUSTER, FORCE, SSH]
 
+    ########################################################################
+    # Monitoring PLOT options
+    ########################################################################
+    START_T = {
+        :name => 'start',
+        :large => '--start date',
+        :description => 'Start date to show data',
+        :format => String
+    }
+
+    END_T = {
+        :name => 'end',
+        :large => '--end date',
+        :description => 'End date to show data',
+        :format => String
+    }
+
+    UNIT = {
+        :name => 'unit',
+        :large => '--unit unit',
+        :description => 'Unit to format data',
+        :format => String
+    }
+
+    TABLE = {
+        :name => 'table',
+        :large => '--table',
+        :description => 'Show monitoring information in table format'
+    }
+
+    N_ELEMS = {
+        :name => 'n_elems',
+        :large => '--n elements',
+        :description => 'Number of records to show',
+        :format => Integer
+    }
+
+    CSV_WITH_SEP = {
+        :name => 'csv',
+        :large => '--csv separator',
+        :description => 'Show data in CSV format',
+        :format => String
+    }
+
+    PLOT_OPTS = [START_T, END_T, UNIT, TABLE, N_ELEMS, CSV_WITH_SEP]
+
     ########################################################################
     # Formatters for arguments
     ########################################################################
@@ -304,4 +351,25 @@ CommandParser::CmdParser.new(ARGV) do
             :options => [OneClusterHelper::CLUSTER] do
         helper.forceupdate(args[0], options)
     end
+
+    monitoring_desc = <<-EOT.unindent
+        Show monitoring metrics in a graphic
+    EOT
+
+    command :monitoring,
+            monitoring_desc,
+            :hostid,
+            :attr,
+            :options => PLOT_OPTS do
+        helper.perform_action(args[0], options, 'monitoring') do |host|
+            rc = host.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(-1)
+            end
+
+            helper.monitoring(host, args[1], options)
+        end
+    end
 end

data/bin/oneimage

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onemarket

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onemarketapp

@@ -29,8 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onesecgroup

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneshowback

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onetemplate

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneuser

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevcenter

@@ -29,8 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevdc

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevm

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -1249,7 +1250,12 @@ CommandParser::CmdParser.new(ARGV) do
         helper.perform_action(args[0], options,
                               'Updating VM configuration') do |vm|
             if template.empty?
-                vm.info
+                rc = vm.info
+
+                if OpenNebula.is_error?(rc)
+                    STDERR.puts "ERROR: #{rc.message}"
+                    exit(-1)
+                end
 
                 template = vm.template_like_str('TEMPLATE', true,
                                                 'OS | FEATURES | INPUT | '\
@@ -1297,6 +1303,86 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    ########################### Charters Management ############################
+
+    create_chart_desc = <<-EOT.unindent
+        Adds a charter to the VM, these are some consecutive scheduled actions
+
+        You can configure the actions in /etc/one/cli/onevm.yaml
+    EOT
+
+    command :'create-chart', create_chart_desc, [:range, :vmid_list] do
+        charters = helper.get_charters
+
+        if charters.nil?
+            STDERR.puts 'No charters found on configuration file'
+            exit(-1)
+        end
+
+        acc_t = 0
+        acc_w = 0
+
+        charters.each do |action, time|
+            sched = "+#{time[:time].to_i + acc_t}"
+
+            helper.schedule_actions(args[0],
+                                    { :schedule => sched },
+                                    action.to_s,
+                                    time[:warning][:time] + acc_w)
+
+            acc_t += time[:time].to_i
+            acc_w += time[:warning][:time].to_i
+        end
+
+        0
+    end
+
+    delete_chart_desc = <<-EOT.unindent
+        Deletes a charter from the VM
+    EOT
+
+    command :'delete-chart', delete_chart_desc, :vmid, :sched_id do
+        helper.perform_action(args[0], {}, 'Charter deleted') do |vm|
+            rc = vm.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error #{rc.message}"
+                exit(-1)
+            end
+
+            xpath = "USER_TEMPLATE/SCHED_ACTION[ID=#{args[1]}]"
+
+            unless vm.retrieve_elements(xpath)
+                STDERR.puts "Sched action #{args[1]} not found"
+                exit(-1)
+            end
+
+            vm.delete_element(xpath)
+            rc = vm.update(vm.user_template_str)
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error deleting: #{rc.message}"
+                exit(-1)
+            end
+        end
+
+        0
+    end
+
+    update_chart_desc = <<-EOT.unindent
+        Updates a charter from a VM
+    EOT
+
+    command :'update-chart',
+            update_chart_desc,
+            :vmid,
+            :sched_id,
+            [:file, nil] do
+        helper.update_schedule_action(args[0], args[1], args[2])
+
+        0
+    end
+
     # Deprecated commands
 
     deprecated_command(:shutdown, 'terminate')

data/bin/onevmgroup

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevnet

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -350,43 +351,9 @@ CommandParser::CmdParser.new(ARGV) do
         Update Address Range variables. SIZE, IP, MAC and TYPE cannot be updated
     EOT
 
-    command :updatear, update_ar_desc, :vnetid, :ar_id, [:file, nil] do
-        helper.perform_action(args[0], options, 'modified') do |obj|
-            rc = obj.info
-
-            if OpenNebula.is_error?(rc)
-                puts rc.message
-                exit(-1)
-            end
-
-            obj.delete_element("AR_POOL/AR[AR_ID!=#{args[1]}]")
-            obj.delete_element('AR_POOL/AR/LEASES')
-            obj.delete_element('AR_POOL/AR/USED_LEASES')
-            obj.delete_element('AR_POOL/AR/MAC_END')
-            obj.delete_element('AR_POOL/AR/IP_END')
-            obj.delete_element('AR_POOL/AR/IP6_ULA')
-            obj.delete_element('AR_POOL/AR/IP6_ULA_END')
-            obj.delete_element('AR_POOL/AR/IP6_GLOBAL')
-            obj.delete_element('AR_POOL/AR/IP6_GLOBAL_END')
-
-            if obj.template_like_str('AR_POOL').empty?
-                puts "Address Range #{args[1]} does not exist for " \
-                     "Virtual Network #{args[0]}"
-                exit(-1)
-            end
-
-            str = OpenNebulaHelper.update_template_helper(false,
-                                                          args[0],
-                                                          obj,
-                                                          args[2],
-                                                          'AR_POOL',
-                                                          false)
-
-            helper.set_client(options)
-            obj = helper.retrieve_resource(obj.id)
-
-            obj.update_ar(str)
-        end
+    command :updatear, update_ar_desc, :vnetid, :ar_id, [:file, nil],
+            :options => OpenNebulaHelper::APPEND do
+        helper.update_ar(args[0], args[1], args[2], options)
     end
 
     rename_desc = <<-EOT.unindent