opennebula-cli 5.8.5 → 5.9.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 253bc8ebcbcfdc1139f455981da95a8043d44328
-  data.tar.gz: b36d99d50d8a70e5456321bd68f8724dee3b44d3
+  metadata.gz: 7daaa3be3b192be84b9cddeba135a6e28622ccbf
+  data.tar.gz: 0400970ef76f852acd9c65d548df83a7b5705a06
 SHA512:
-  metadata.gz: 2d1cae7a51028b7a8e0647b44d9a2d8a2db8483f80085db1dc6edd7e31ab9a5863abd936db5add7eeac421caa709a0de717d1c97200f998a1144c96f40255c96
-  data.tar.gz: aae2915016a07cc0ffa13f9b9dfbeaab37154b62b893d72ee3299fc1d252524960b28feea5b59f02158a0e95d8d2c570d446776efbd605733d9614116500044a
+  metadata.gz: a0e4142161c7efdc5541cb9cd020a8ba384e5b9800ec62acebf151e74f9942ec3ff5398be3e63debb67a9a3d455d8b5791108632e11128abeed130d1e9d1e5fa
+  data.tar.gz: 283b1c11a82c8a29f74d575c03b096b7f3397c90dcf6f609e9485212f87850edbeca7310677d174721e052c3fd3d78b23d69565feee5c5c95f637845de6701aa

data/bin/oneacct

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneacl

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -94,7 +100,8 @@ CommandParser::CmdParser.new(ARGV) do
         Lists the ACL rule set
     EOT
 
-    command :list, list_desc, :options => [OpenNebulaHelper::XML,
+    command :list, list_desc, :options => [CLIHelper::OPTIONS,
+                                           OpenNebulaHelper::XML,
                                            OpenNebulaHelper::DESCRIBE] do
         helper.list_pool(options)
     end

data/bin/onecluster

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -110,7 +116,8 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Cluster
     EOT
 
-    command :show, show_desc, :clusterid, :options => OpenNebulaHelper::XML do
+    command :show, show_desc, :clusterid,
+            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 

data/bin/onedatastore

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -152,7 +158,8 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Datastore
     EOT
 
-    command :show, show_desc, :datastoreid, :options => OpenNebulaHelper::XML do
+    command :show, show_desc, :datastoreid,
+            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 

data/bin/oneflow

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -224,16 +230,17 @@ def show_service(client, args, options)
                          'INFORMATION'
             CLIHelper.print_header(str_h1 % str_header)
 
-            puts format(str, ['ID', document_hash['DOCUMENT']['ID']])
-            puts format(str, ['NAME', document_hash['DOCUMENT']['NAME']])
-            puts format(str, ['USER', document_hash['DOCUMENT']['UNAME']])
-            puts format(str, ['GROUP', document_hash['DOCUMENT']['GNAME']])
+            puts Kernel.format(str, 'ID', document_hash['DOCUMENT']['ID'])
+            puts Kernel.format(str, 'NAME', document_hash['DOCUMENT']['NAME'])
+            puts Kernel.format(str, 'USER', document_hash['DOCUMENT']['UNAME'])
+            puts Kernel.format(str, 'GROUP', document_hash['DOCUMENT']['GNAME'])
 
-            puts format(str, ['STRATEGY', template['deployment']])
-            puts format(str,
-                        ['SERVICE STATE', Service.state_str(template['state'])])
+            puts Kernel.format(str, 'STRATEGY', template['deployment'])
+            puts Kernel.format(str,
+                               'SERVICE STATE',
+                               Service.state_str(template['state']))
             if template['shutdown_action']
-                puts format(str, ['SHUTDOWN', template['shutdown_action']])
+                puts Kernel.format(str, 'SHUTDOWN', template['shutdown_action'])
             end
 
             puts
@@ -247,7 +254,7 @@ def show_service(client, args, options)
                 mask[1] = 'm' if permissions_hash["#{e}_M"] == '1'
                 mask[2] = 'a' if permissions_hash["#{e}_A"] == '1'
 
-                puts format(str, [e, mask])
+                puts Kernel.format(str, e, mask)
             end
 
             puts
@@ -255,23 +262,27 @@ def show_service(client, args, options)
             template['roles'].each do |role|
                 CLIHelper.print_header("ROLE #{role['name']}", false)
 
-                puts format(str, ['ROLE STATE', Role.state_str(role['state'])])
+                puts Kernel.format(str,
+                                   'ROLE STATE',
+                                   Role.state_str(role['state']))
                 if role['parents']
-                    puts format(str, ['PARENTS', role['parents'].join(', ')])
+                    puts Kernel.format(str,
+                                       'PARENTS',
+                                       role['parents'].join(', '))
                 end
-                puts format(str, ['VM TEMPLATE', role['vm_template']])
-                puts format(str, ['CARDINALITY', role['cardinality']])
+                puts Kernel.format(str, 'VM TEMPLATE', role['vm_template'])
+                puts Kernel.format(str, 'CARDINALITY', role['cardinality'])
                 if role['min_vms']
-                    puts format(str, ['MIN VMS', role['min_vms']])
+                    puts Kernel.format(str, 'MIN VMS', role['min_vms'])
                 end
                 if role['max_vms']
-                    puts format(str, ['MAX VMS', role['max_vms']])
+                    puts Kernel.format(str, 'MAX VMS', role['max_vms'])
                 end
                 if role['coolddown']
-                    puts format(str, ['COOLDOWN', "#{role['cooldown']}s"])
+                    puts Kernel.format(str, 'COOLDOWN', "#{role['cooldown']}s")
                 end
                 if role['shutdown_action']
-                    puts format(str, ['SHUTDOWN', role['shutdown_action']])
+                    puts Kernel.format(str, 'SHUTDOWN', role['shutdown_action'])
                 end
 
                 puts 'NODES INFORMATION'

data/bin/oneflow-template

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onegroup

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onehook

@@ -0,0 +1,303 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, 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    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+ONE_LOCATION = ENV['ONE_LOCATION']
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
+else
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
+end
+
+$LOAD_PATH << RUBY_LIB_LOCATION
+$LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
+
+require 'command_parser'
+require 'one_helper'
+require 'one_helper/onehook_helper'
+
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onehook` <command> [<args>] [<options>]'
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneHookHelper.new
+
+    before_proc do
+        helper.set_client(options)
+    end
+
+    USE = {
+        :name => 'use',
+        :large => '--use',
+        :description => 'lock use actions'
+    }
+
+    MANAGE = {
+        :name => 'manage',
+        :large => '--manage',
+        :description => 'lock manage actions'
+    }
+
+    ADMIN = {
+        :name => 'admin',
+        :large => '--admin',
+        :description => 'lock admin actions'
+    }
+
+    ALL = {
+        :name => 'all',
+        :large => '--all',
+        :description => 'lock all actions'
+    }
+
+    EXECUTION = {
+        :name => 'execution',
+        :large => '--execution exeid',
+        :short => '-e exeid',
+        :format => String,
+        :description => 'execution ID'
+    }
+
+    set :format, :hookid, OpenNebulaHelper.rname_to_id_desc('HOOK') do |arg|
+        OpenNebulaHelper.rname_to_id(arg, 'HOOK')
+    end
+
+    ########################################################################
+    # Hook log Options
+    ########################################################################
+
+    ERROR = {
+        :name => 'error',
+        :large => '--error',
+        :description => 'Show only fail executions'
+    }
+
+    SUCCESS = {
+        :name => 'success',
+        :large => '--success',
+        :description => 'Show only success executions'
+    }
+
+    HOOK_ID = {
+        :name => 'hook_id',
+        :large => '--hook-id id',
+        :description => 'Hook ID to check logs',
+        :format => Integer
+    }
+
+    SINCE = {
+        :name => 'since',
+        :large => '--since date',
+        :description => 'First date to take logs',
+        :format => String
+    }
+
+    UNTIL = {
+        :name => 'until',
+        :large => '--until date',
+        :description => 'Last date to take logs',
+        :format => String
+    }
+
+    LOG_OPTIONS = [ERROR, SUCCESS, HOOK_ID, SINCE, UNTIL]
+
+    ########################################################################
+    # Global Options
+    ########################################################################
+    set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
+
+    list_options = CLIHelper::OPTIONS
+    list_options << OpenNebulaHelper::XML
+    list_options << OpenNebulaHelper::NUMERIC
+    list_options << OpenNebulaHelper::DESCRIBE
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new Hook from the given description
+
+        Examples:
+          - using a Hook description file:
+
+            onehook create hook.tmpl
+
+    EOT
+
+    command :create, create_desc, :file, :options =>
+            [OpenNebulaHelper::DRY] do
+        helper.create_resource(options) do |tmpl|
+            begin
+                if args[0]
+                    template = File.read(args[0])
+                end
+
+                if options[:dry]
+                    puts template
+                    exit 0
+                else
+                    tmpl.allocate(template)
+                end
+            rescue StandardError => e
+                STDERR.puts e.messsage
+                exit(-1)
+            end
+        end
+    end
+
+    delete_desc = <<-EOT.unindent
+        Deletes the given Hook
+    EOT
+
+    command :delete, delete_desc, [:range, :hookid_list] do
+        helper.perform_actions(args[0], options, 'deleted') do |t|
+            t.delete
+        end
+    end
+
+    update_desc = <<-EOT.unindent
+        Update the Hook contents. If a path is not provided the editor will
+        be launched to modify the current content.
+    EOT
+
+    command :update, update_desc, :hookid, [:file, nil],
+            :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
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
+            obj.update(str, options[:append])
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Hook
+    EOT
+
+    command :rename, rename_desc, :hookid, :name do
+        helper.perform_action(args[0], options, 'renamed') do |o|
+            o.rename(args[1])
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists Hooks in the pool
+    EOT
+
+    command :list, list_desc, [:filterflag, nil], :options => list_options do
+        helper.list_pool(options, false, args[0])
+    end
+
+    show_desc = <<-EOT.unindent
+        Shows information for the given Hook. An execution ID can be given to
+        obtain detailed information of a given hook execution
+    EOT
+
+    command :show, show_desc, :hookid,
+            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::EXTENDED,
+                         EXECUTION] do
+        helper.show_resource(args[0], options)
+    end
+
+    top_desc = <<-EOT.unindent
+        Lists Hooks continuously
+    EOT
+
+    command :top, top_desc, [:filterflag, nil], :options => list_options do
+        helper.list_pool(options, true, args[0])
+    end
+
+    lock_desc = <<-EOT.unindent
+        Locks a Hook with differents levels for lock any actions with this Hook,
+        show and monitoring never will be locked.
+        Valid states are: All.
+        Levels:
+        [Use]: locks Admin, Manage and Use actions.
+        [Manage]: locks Manage and Use actions.
+        [Admin]: locks only Admin actions.
+    EOT
+
+    command :lock, lock_desc, :hookid,
+            :options => [USE, MANAGE, ADMIN, ALL] do
+        helper.perform_action(args[0], options, 'Hook locked') do |t|
+            if !options[:use].nil?
+                level = 1
+            elsif !options[:manage].nil?
+                level = 2
+            elsif !options[:admin].nil?
+                level = 3
+            elsif !options[:all].nil?
+                level = 4
+            else
+                level = 1
+            end
+            t.lock(level)
+        end
+    end
+
+    unlock_desc = <<-EOT.unindent
+        Unlocks a Hook for unlock any actions with this Hook.
+        Valid states are: All.
+    EOT
+
+    command :unlock, unlock_desc, :hookid do
+        helper.perform_action(args[0], options, 'Hook unlocked') do |t|
+            t.unlock
+        end
+    end
+
+    retry_desc = <<-EOT.unindent
+        Retry a previous hook execution.
+    EOT
+
+    command :retry, retry_desc, :hookid, :execid do
+        helper.perform_action(args[0], options, 'Retry executed') do |t|
+            t.retry args[1].to_i
+        end
+    end
+
+    log_desc = <<-EOT.unindent
+    Get logs about hook executions
+
+    Examples:
+
+        ~ $ onehook log --since 09/19/19 # returns all logs since that date
+        ~ $ onehook log --error          # returns all failing execs logs
+        ~ $ onehook log --hook-id 0      # returns all logs from hook 0
+
+    EOT
+
+    command :log, log_desc, :options => [LOG_OPTIONS, OpenNebulaHelper::XML] do
+        helper.hook_logs(options)
+
+        0
+    end
+end