opennebula-cli 5.11.80.pre → 5.12.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 768b86165d0c44d9ec4e0f88618a51ef1058b75b
-  data.tar.gz: b7736f3f80410ca456a45ac4e1f441eff5d3fa55
+  metadata.gz: d83e153918c260f5bc09db239c77f492324e1f40
+  data.tar.gz: 7fcca13a86384ec0fb65ebcb7688179df29f55af
 SHA512:
-  metadata.gz: 428a91440d21381152277c91e97c9ab06f2b2c2e8f968b1852c48e788a294727e9807588d20cce6d852714e042ef9b09ffdf87985efa16096a35d356228b9aa2
-  data.tar.gz: 7c4aeb87e22274c51171d4708306933d9d99e4ab34704888d2ddc4c100c7686f40f6fcc008a1237d35ba7b5df1ad871ca47faee95a3f40089f1e6339461356b9
+  metadata.gz: 5fa4092f03463ac4db38f8b395321bd2a41d662c3497c76487eb063511663dd091690e15e7e056addfaffe33bc9602293177ed4b74eaade5d00b485cd12a7c73
+  data.tar.gz: 365a24105b7d6e1a934cc1f1f5b23f5902a55aec06fbad0606affba56950c4216c66aa511672297e7db86d610b18d84d5aa7af2e08cf28562aad2c4cbfe61466

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
@@ -75,6 +76,13 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
+    TAG = {
+        :name => 'tag',
+        :large => '--tag tag',
+        :format => String,
+        :description => 'DockerHub image tag (default latest)'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -87,7 +95,8 @@ CommandParser::CmdParser.new(ARGV) do
 
     CREATE_OPTIONS = [OneMarketPlaceHelper::MARKETPLACE]
     EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE,
-                      OneMarketPlaceAppHelper::VMNAME]
+                      OneMarketPlaceAppHelper::VMNAME,
+                      TAG]
 
     ########################################################################
     # Formatters for arguments
@@ -172,10 +181,13 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :export, export_desc, :appid, :name, :options => EXPORT_OPTIONS do
         helper.perform_action(args[0], options, 'exported') do |obj|
+            tag ="tag=#{options[:tag]}" if options[:tag]
+
             rc = obj.export(
                 :dsid => options[:datastore],
                 :name => args[1],
-                :vmtemplate_name => options[:vmname]
+                :vmtemplate_name => options[:vmname],
+                :url_args => tag
             )
 
             next rc if OpenNebula.is_error?(rc)

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')