opennebula-cli 5.10.5 → 5.12.1

data/lib/one_helper/oneuser_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# 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    #

data/lib/one_helper/onevcenter_helper.rb

@@ -1,6 +1,6 @@
 
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -96,6 +96,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
     end
 
     def host(arg)
+        return arg
     end
 
     ########################
@@ -236,11 +237,11 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
                 d[:import_id]
             end
 
-            column :REF, "ref", :left, :size=>config[:REF] || 15 do |d|
+            column :REF, "ref", :left, :adjust, :size=>config[:REF] || 15 do |d|
                 d[:ref]
             end
 
-            column :NAME, "Name", :left, :size=>config[:NAME] || 20 do |d|
+            column :NAME, "Name", :left, :expand, :size=>config[:NAME] || 20 do |d|
                 d[:name] || d[:simple_name]
             end
 
@@ -249,7 +250,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
                 d[:one_ids] || d[:cluster].to_s
             end
 
-            column :PATH, "PATH", :left, :size=>config[:PATH] || 10 do |d|
+            column :PATH, "PATH", :left, :expand, :size=>config[:PATH] || 10 do |d|
                 d[:path]
             end
 

data/lib/one_helper/onevdc_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# 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    #

data/lib/one_helper/onevm_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -345,16 +345,16 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 OneVMHelper.state_to_str(d['STATE'], d['LCM_STATE'])
             end
 
-            column :UCPU, 'CPU percentage used by the VM', :size => 4 do |d|
-                cpu = d['MONITORING']['CPU']
+            column :CPU, 'CPU asigned to the VM', :size => 4 do |d|
+                cpu = d['TEMPLATE']['CPU']
                 cpu = '0' if cpu.nil?
 
                 cpu
             end
 
-            column :UMEM, 'Memory used by the VM', :size => 7 do |d|
-                OpenNebulaHelper.unit_to_str(d['MONITORING']['MEMORY'].to_i,
-                                             options)
+            column :MEM, 'Memory asigned to the VM', :size => 7 do |d|
+                OpenNebulaHelper.unit_to_str(d['TEMPLATE']['MEMORY'].to_i,
+                                             options, 'M')
             end
 
             column :HOST, 'Host where the VM is running',
@@ -395,14 +395,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 OneVMHelper.ip_str(d)
             end
 
-            default :ID, :USER, :GROUP, :NAME, :STAT, :UCPU, :UMEM, :HOST,
+            default :ID, :USER, :GROUP, :NAME, :STAT, :CPU, :MEM, :HOST,
                     :TIME
         end
 
         table
     end
 
-    def schedule_actions(ids, options, action)
+    def schedule_actions(ids, options, action, warning = nil)
         # Verbose by default
         options[:verbose] = true
 
@@ -453,17 +453,74 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 id = ids.max + 1
             end
 
+            sched = options[:schedule]
+
+            # If the action is set to be executed from VM start to an specific
+            # amount of time later, we should preserve the + symbol
+            if ((sched.is_a? String) && !sched.include?('+')) ||
+                !(sched.is_a? String)
+                sched = sched.to_i
+            end
+
             tmp_str = vm.user_template_str
 
             tmp_str << "\nSCHED_ACTION = "
             tmp_str << "[ID = #{id}, ACTION = #{action}, "
-            tmp_str << "TIME = #{options[:schedule].to_i}"
+            tmp_str << "WARNING = #{warning}," if warning
+            tmp_str << "ARGS = \"#{options[:args]}\"," if options[:args]
+            tmp_str << "TIME = #{sched}"
             tmp_str << str_periodic << ']'
 
             vm.update(tmp_str)
         end
     end
 
+    # Update schedule action
+    #
+    # @param vm_id     [Integer] Virtual Machine ID
+    # @param action_id [Integer] Sched action ID
+    # @param file      [String]  File path with update content
+    def update_schedule_action(vm_id, action_id, file)
+        perform_action(vm_id, {}, 'Sched action updated') do |vm|
+            rc = vm.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error #{rc.message}"
+                exit(-1)
+            end
+
+            xpath = "USER_TEMPLATE/SCHED_ACTION[ID=#{action_id}]"
+
+            unless vm.retrieve_elements(xpath)
+                STDERR.puts "Sched action #{action_id} not found"
+                exit(-1)
+            end
+
+            # Get user information
+            if file
+                str = File.read(file)
+            else
+                str = OpenNebulaHelper.update_template(vm_id, vm, nil, xpath)
+            end
+
+            # Delete the current sched action
+            vm.delete_element(xpath)
+
+            # Add the modified sched action
+            tmp_str = vm.user_template_str
+            tmp_str << "\nSCHED_ACTION = ["
+            tmp_str << str.split("\n").join(',')
+            tmp_str << ']'
+
+            rc = vm.update(tmp_str)
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error updating: #{rc.message}"
+                exit(-1)
+            end
+        end
+    end
+
     RECOVER_RETRY_STEPS = {
         :PROLOG_MIGRATE_FAILURE => :migrate,
         :PROLOG_MIGRATE_POWEROFF_FAILURE => :migrate,
@@ -601,6 +658,16 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
     end
 
+    # Get charters configuration
+    #
+    #   @return [Array]
+    #       - action
+    #           - time
+    #           - warning
+    def get_charters
+        YAML.load_file(self.class.table_conf)[:charters]
+    end
+
     private
 
     def factory(id = nil)
@@ -1143,20 +1210,24 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             CLIHelper.print_header(str_h1 % 'SCHEDULED ACTIONS', false)
 
             CLIHelper::ShowTable.new(nil, self) do
-                column :ID, '', :size => 2 do |d|
+                column :ID, '', :adjust => true do |d|
                     d['ID'] unless d.nil?
                 end
 
-                column :ACTION, '', :left, :size => 15 do |d|
+                column :ACTION, '', :adjust => true do |d|
                     d['ACTION'] unless d.nil?
                 end
 
-                column :SCHEDULED, '', :size => 12 do |d|
+                column :ARGS, '', :adjust => true do |d|
+                    d['ARGS'] ? d['ARGS'] : '-'
+                end
+
+                column :SCHEDULED, '', :adjust => true do |d|
                     OpenNebulaHelper.time_to_str(d['TIME'], false) \
                         unless d.nil?
                 end
 
-                column :REPEAT, '', :size => 20 do |d|
+                column :REPEAT, '', :adjust => true do |d|
                     str_rep = ''
                     if !d.nil? && d.key?('REPEAT')
                         if d['REPEAT'] == '0'
@@ -1175,7 +1246,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     str_rep unless d.nil?
                 end
 
-                column :END, '', :size => 20 do |d|
+                column :END, '', :adjust => true do |d|
                     str_end = ''
                     if !d.nil? && d.key?('END_TYPE')
                         if d['END_TYPE'] == '0'
@@ -1192,25 +1263,50 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     str_end unless d.nil?
                 end
 
-                column :DONE, '', :size => 12 do |d|
+                column :DONE, '', :adjust => true do |d|
                     OpenNebulaHelper.time_to_str(d['DONE'], false) \
                         unless d.nil?
                 end
 
-                column :MESSAGE, '', :left, :adjust, :size => 35 do |d|
-                    d['MESSAGE'] unless d.nil?
+                column :MESSAGE, '', :size => 35 do |d|
+                    d['MESSAGE'] ? d['MESSAGE'] : '-'
+                end
+
+                column :CHARTER, '', :left, :adjust, :size => 15 do |d|
+                    t1 = Time.now
+                    t2 = Time.at(vm['STIME'].to_i + d['TIME'].to_i)
+
+                    days    = ((t2 - t1) / (24 * 3600)).round(2)
+                    hours   = ((t2 - t1) / 3600).round(2)
+                    minutes = ((t2 - t1) / 60).round(2)
+
+                    if days > 1
+                        show = "In #{days} days"
+                    elsif days < 1 && hours > 1
+                        show = "In #{hours} hours"
+                    elsif minutes > 0
+                        show = "In #{minutes} minutes"
+                    else
+                        show = 'Already done'
+                    end
+
+                    if (t1 - vm['STIME'].to_i).to_i > d['WARNING'].to_i
+                        "#{show} *"
+                    else
+                        show
+                    end
                 end
             end.show([vm_hash['VM']['USER_TEMPLATE']['SCHED_ACTION']].flatten,
                      {})
         end
 
+        if !options[:all]
+            vm.delete_element('/VM/USER_TEMPLATE/SCHED_ACTION')
+        end
+
         if vm.has_elements?('/VM/USER_TEMPLATE')
             puts
 
-            if !options[:all]
-                vm.delete_element('/VM/USER_TEMPLATE/SCHED_ACTION')
-            end
-
             CLIHelper.print_header(str_h1 % 'USER TEMPLATE', false)
             puts vm.template_like_str('USER_TEMPLATE')
         end

data/lib/one_helper/onevmgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# 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    #

data/lib/one_helper/onevnet_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and        #
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
-
 require 'one_helper'
 require 'one_helper/onevm_helper'
 
@@ -215,6 +214,71 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         orphans
     end
 
+    # Update VNet address range
+    #
+    # @param vnet_id [Intenger] Virtual Network ID
+    # @param ar_id   [Intenger] Address Range ID
+    # @param file    [String]   Path to file to read
+    # @param options [Hash]     User CLI options
+    def update_ar(vnet_id, ar_id, file, options)
+        perform_action(vnet_id, options, 'AR updated') do |obj|
+            rc = obj.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(-1)
+            end
+
+            obj.delete_element("AR_POOL/AR[AR_ID!=#{ar_id}]")
+            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?
+                STDERR.puts "Address Range #{ar_id} does not exist for " \
+                            "Virtual Network #{vnet_id}"
+                exit(-1)
+            end
+
+            xpath = "AR_POOL/AR[AR_ID=#{ar_id}]"
+
+            if options[:append]
+                str = OpenNebulaHelper.append_template(vnet_id,
+                                                       obj,
+                                                       file,
+                                                       xpath)
+            else
+                str = OpenNebulaHelper.update_template(vnet_id,
+                                                       obj,
+                                                       file,
+                                                       xpath)
+            end
+
+            if options[:append]
+                # Insert element in current template
+                parts = obj.template_like_str('AR_POOL').split("\n")
+
+                # Insert it in second position, OpenNebula will sort it
+                parts.insert(1, "#{str.strip},")
+
+                parts = parts.join("\n")
+                str   = parts
+            else
+                # Use the information from user
+                unless str.gsub(' ', '').match(/AR=\[/)
+                    str = "AR=[\n#{str.split("\n").join(",\n")}]"
+                end
+            end
+
+            obj.update_ar(str)
+        end
+    end
+
     private
 
     def factory(id=nil)

data/lib/one_helper/onevntemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# 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    #

data/lib/one_helper/onevrouter_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# 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    #

data/lib/one_helper/onezone_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -36,6 +36,8 @@ class Replicator
           :service => 'opennebula' },
         { :name    => 'ec2_driver.default',
           :service => 'opennebula' },
+        { :name    => 'monitord.conf',
+          :service => 'opennebula' },
         { :name    => 'econe.conf',
           :service => 'opennebula-econe' },
         { :name    => 'oneflow-server.conf',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.10.5
+  version: 5.12.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.10.5
+        version: 5.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.10.5
+        version: 5.12.1
 description: Commands used to talk to OpenNebula
-email: contact@opennebula.org
+email: contact@opennebula.io
 executables:
 - oneacct
 - oneacl
@@ -85,6 +85,8 @@ files:
 - lib/one_helper/oneacl_helper.rb
 - lib/one_helper/onecluster_helper.rb
 - lib/one_helper/onedatastore_helper.rb
+- lib/one_helper/oneflow_helper.rb
+- lib/one_helper/oneflowtemplate_helper.rb
 - lib/one_helper/onegroup_helper.rb
 - lib/one_helper/onehook_helper.rb
 - lib/one_helper/onehost_helper.rb
@@ -106,7 +108,7 @@ files:
 - lib/one_helper/onezone_helper.rb
 - NOTICE
 - LICENSE
-homepage: http://opennebula.org
+homepage: http://opennebula.io
 licenses:
 - Apache-2.0
 metadata: {}