opennebula-cli 5.10.5 → 5.12.0.1

data/bin/onegroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -29,7 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -77,13 +79,12 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Force probe upgrade in onehost sync'
     }
 
-    RSYNC = {
-        :name => 'rsync',
-        :large => '--rsync',
-        :description => 'Use rsync to synchronize remotes. In case some '\
-                        'probes are no longer in the fronted ithey will be '\
-                        'deleted in the hosts. rsync command must be '\
-                        'installed in the frontend and nodes.'
+    SSH = {
+        :name => 'ssh',
+        :large => '--ssh',
+        :description => 'Use SSH to synchronize remotes. In case some '\
+                        'probes are no longer in the fronted they will be '\
+                        'deleted in the hosts.'
     }
 
     TYPE = {
@@ -95,7 +96,53 @@ CommandParser::CmdParser.new(ARGV) do
     }
 
     CREAT_OPTIONS = [IM, VMM, OneClusterHelper::CLUSTER, TYPE]
-    SYNC_OPTIONS  = [OneClusterHelper::CLUSTER, FORCE, RSYNC]
+    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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -29,7 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -74,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
     ########################################################################
@@ -86,7 +95,8 @@ CommandParser::CmdParser.new(ARGV) do
 
     CREATE_OPTIONS = [OneMarketPlaceHelper::MARKETPLACE]
     EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE,
-                      OneMarketPlaceAppHelper::VMNAME]
+                      OneMarketPlaceAppHelper::VMNAME,
+                      TAG]
 
     ########################################################################
     # Formatters for arguments
@@ -171,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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -29,7 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -27,7 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -927,6 +929,9 @@ CommandParser::CmdParser.new(ARGV) do
                                        OneVMHelper::HOURLY,
                                        OneVMHelper::END_TIME] do
         if !options[:schedule].nil?
+            # add name as an argument
+            options[:args] = args[1]
+
             helper.schedule_actions(args[0], options, @comm_name)
         else
             helper.perform_actions(args[0], options, 'snapshot created') do |o|
@@ -940,9 +945,22 @@ CommandParser::CmdParser.new(ARGV) do
         Reverts a VM to a saved snapshot
     EOT
 
-    command :"snapshot-revert", snapshot_revert_desc, :vmid, :snapshot_id do
-        helper.perform_action(args[0], options, 'snapshot reverted') do |o|
-            o.snapshot_revert(args[1].to_i)
+    command :"snapshot-revert", snapshot_revert_desc, :vmid, :snapshot_id,
+            :options => [OneVMHelper::SCHEDULE,
+                         OneVMHelper::WEEKLY,
+                         OneVMHelper::MONTHLY,
+                         OneVMHelper::YEARLY,
+                         OneVMHelper::HOURLY,
+                         OneVMHelper::END_TIME] do
+        if !options[:schedule].nil?
+            # add snap ID as an argument
+            options[:args] = args[1]
+
+            helper.schedule_actions([args[0]], options, @comm_name)
+        else
+            helper.perform_action(args[0], options, 'snapshot reverted') do |o|
+                o.snapshot_revert(args[1].to_i)
+            end
         end
     end
 
@@ -951,9 +969,22 @@ CommandParser::CmdParser.new(ARGV) do
         Delets a snapshot of a VM
     EOT
 
-    command :"snapshot-delete", snapshot_delete_desc, :vmid, :snapshot_id do
-        helper.perform_action(args[0], options, 'snapshot deleted') do |o|
-            o.snapshot_delete(args[1])
+    command :"snapshot-delete", snapshot_delete_desc, :vmid, :snapshot_id,
+            :options => [OneVMHelper::SCHEDULE,
+                         OneVMHelper::WEEKLY,
+                         OneVMHelper::MONTHLY,
+                         OneVMHelper::YEARLY,
+                         OneVMHelper::HOURLY,
+                         OneVMHelper::END_TIME] do
+        if !options[:schedule].nil?
+            # add snap ID as an argument
+            options[:args] = args[1]
+
+            helper.schedule_actions([args[0]], options, @comm_name)
+        else
+            helper.perform_action(args[0], options, 'snapshot deleted') do |o|
+                o.snapshot_delete(args[1])
+            end
         end
     end
 
@@ -965,9 +996,23 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"disk-snapshot-create", disk_snapshot_create_desc,
-            :vmid, :diskid, :name do
-        helper.perform_action(args[0], options, 'disk snapshot created') do |o|
-            o.disk_snapshot_create(args[1].to_i, args[2])
+            :vmid, :diskid, :name,
+            :options => [OneVMHelper::SCHEDULE,
+                         OneVMHelper::WEEKLY,
+                         OneVMHelper::MONTHLY,
+                         OneVMHelper::YEARLY,
+                         OneVMHelper::HOURLY,
+                         OneVMHelper::END_TIME] do
+        if !options[:schedule].nil?
+            # add disk ID and name as arguments
+            options[:args] = "#{args[1]},#{args[2]}"
+
+            helper.schedule_actions([args[0]], options, @comm_name)
+        else
+            helper.perform_action(args[0], options,
+                                  'disk snapshot created') do |o|
+                o.disk_snapshot_create(args[1].to_i, args[2])
+            end
         end
     end
 
@@ -978,9 +1023,23 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"disk-snapshot-revert", disk_snapshot_revert_desc,
-            :vmid, :diskid, :disk_snapshot_id do
-        helper.perform_action(args[0], options, 'disk snapshot reverted') do |o|
-            o.disk_snapshot_revert(args[1].to_i, args[2].to_i)
+            :vmid, :diskid, :disk_snapshot_id,
+            :options => [OneVMHelper::SCHEDULE,
+                         OneVMHelper::WEEKLY,
+                         OneVMHelper::MONTHLY,
+                         OneVMHelper::YEARLY,
+                         OneVMHelper::HOURLY,
+                         OneVMHelper::END_TIME] do
+        if !options[:schedule].nil?
+            # add disk ID and snap ID as arguments
+            options[:args] = "#{args[1]},#{args[2]}"
+
+            helper.schedule_actions([args[0]], options, @comm_name)
+        else
+            helper.perform_action(args[0], options,
+                                  'disk snapshot reverted') do |o|
+                o.disk_snapshot_revert(args[1].to_i, args[2].to_i)
+            end
         end
     end
 
@@ -991,9 +1050,23 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"disk-snapshot-delete", disk_snapshot_delete_desc,
-            :vmid, :diskid, :disk_snapshot_id do
-        helper.perform_action(args[0], options, 'disk snapshot deleted') do |o|
-            o.disk_snapshot_delete(args[1].to_i, args[2].to_i)
+            :vmid, :diskid, :disk_snapshot_id,
+            :options => [OneVMHelper::SCHEDULE,
+                         OneVMHelper::WEEKLY,
+                         OneVMHelper::MONTHLY,
+                         OneVMHelper::YEARLY,
+                         OneVMHelper::HOURLY,
+                         OneVMHelper::END_TIME] do
+        if !options[:schedule].nil?
+            # add disk ID and snap ID as arguments
+            options[:args] = "#{args[1]},#{args[2]}"
+
+            helper.schedule_actions([args[0]], options, @comm_name)
+        else
+            helper.perform_action(args[0], options,
+                                  'disk snapshot deleted') do |o|
+                o.disk_snapshot_delete(args[1].to_i, args[2].to_i)
+            end
         end
     end