opennebula-cli 5.8.0 → 5.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe049a40201dabb3ab6af5af5a94dfe86c3bd260
-  data.tar.gz: 26e453a1dbc3b0501da198b80a481d4fa6c5a99a
+  metadata.gz: 47059f335807d405140d9dab14153c81801884e2
+  data.tar.gz: 4701f2cf65db8d7d9369651586da00778f31f543
 SHA512:
-  metadata.gz: 910e873ea0a7024ef4eaa70c6247b7c09c2a92c2e1e04b726eea74ab1cf5700e0f522c9c84d576f8d97b7c79d5c859e071d2abac46294b9488dda866fbed1a4d
-  data.tar.gz: bf953b9791f13555de9ee1818f92fb429859c391d510ff1fb614d22dbfc3cbd430c3b2222055770c04441ffd428a49d40eb73bdc9e9a1a19a3bba7ba09dcb2de
+  metadata.gz: b3891e1dd12ce654c048c2504cd994732cce51bdb090d65d6a0277934163209ba59fe99192962ca250bc08ecd8855f1c80eb47aa747c49032dc46e6eff425e72
+  data.tar.gz: 2026f29b2134d32baaef9fe620a2337f467bc8367d927d27be4c694de45f0c15d7ee3c90bc86aea257709b4030cc425a183a005ecbe45bd1388db7d596da732e

data/bin/oneflow

@@ -280,12 +280,12 @@ def show_service(client, args, options)
                 if !role['elasticity_policies'].nil? &&
                    !role['elasticity_policies'].empty? ||
                    !role['scheduled_policies'].nil? &&
-                   !role['scheduled_policies'].emtpty?
+                   !role['scheduled_policies'].empty?
                     puts
                     puts 'ELASTICITY RULES'
 
                     if role['elasticity_policies'] &&
-                       !role['elasticity_policies'].emtpty?
+                       !role['elasticity_policies'].empty?
                         puts
                         #                        puts 'ELASTICITY POLICIES'
                         CLIHelper::ShowTable.new(nil, self) do

data/bin/onevm

@@ -1054,7 +1054,8 @@ CommandParser::CmdParser.new(ARGV) do
             table = helper.format_pool(options)
             pool = OpenNebula::VirtualMachinePool.new(OneVMHelper.get_client)
 
-            rc = pool.info_search(:query => options[:search])
+            rc = pool.info_search(:query    => options[:search],
+                                  :extended => options[:extended])
 
             if !rc.nil?
                 puts rc.message

data/bin/onezone

@@ -114,6 +114,11 @@ CommandParser::CmdParser.new(ARGV) do
             exit(-1)
         end
 
+        if !%r{^(http|https):\/\/}.match(options[:server_rpc])
+            puts 'Wrong protocol specified. Only http or https allowed!'
+            exit(-1)
+        end
+
         template = <<-EOT
             SERVER = [
               NAME="#{options[:server_name]}",

data/lib/cli_helper.rb

@@ -55,6 +55,14 @@ module CLIHelper
         :description => "Filter data. An array is specified with\n"<<
                         " "*31<<"column=value pairs."
     }
+    OPERATOR = {
+        :name  => "operator",
+        :large => "--operator operator",
+        :format => String,
+        :description => "Logical operator used on filters: AND, OR."<<
+                        " Default: AND."
+    }
+ 
     #
     #HEADER = {
     #    :name  => "header",
@@ -82,7 +90,7 @@ module CLIHelper
     }
 
     #OPTIONS = [LIST, ORDER, FILTER, HEADER, DELAY]
-    OPTIONS = [LIST, LISTCONF, DELAY, FILTER, CSV_OPT, NO_PAGER]
+    OPTIONS = [LIST, LISTCONF, DELAY, FILTER, OPERATOR, CSV_OPT, NO_PAGER]
 
     # Sets bold font
     def CLIHelper.scr_bold
@@ -330,7 +338,7 @@ module CLIHelper
             }
 
             if options
-                filter_data!(res_data, options[:filter]) if options[:filter]
+                filter_data!(res_data, options) if options[:filter]
                 sort_data!(res_data, options[:order]) if options[:order]
             end
 
@@ -393,10 +401,16 @@ module CLIHelper
             }.compact.join(' ')
         end
 
-        def filter_data!(data, filter)
+        def filter_data!(data, options)
             # TBD: add more operators
             # operators=/(==|=|!=|<|<=|>|>=)/
             operators=/(=|!=)/
+            filter = options[:filter]
+            if options.key?(:operator)
+              log_operator = options[:operator].upcase
+            else
+                log_operator = "AND"
+            end
 
             stems=filter.map do |s|
                 m=s.match(/^(.*?)#{operators}(.*?)$/)
@@ -427,12 +441,19 @@ module CLIHelper
                 stems.each do |s|
 
                     if d[s[:index]].public_send(s[:operator] == "=" ? "==" : s[:operator], s[:right])
-                        pass=false
-                        break
+                        if log_operator == "OR"
+                            pass = true
+                            break
+                        end
+                    else
+                        pass = false
+                        if log_operator == "AND"
+                            break
+                        end
                     end
                 end
 
-                !pass
+                pass
             end
         end
 

data/lib/one_helper.rb

@@ -391,6 +391,12 @@ EOT
         :description => 'Overwrite the file'
     }
 
+    EXTENDED={
+        :name => 'extended',
+        :large => '--extended',
+        :description => 'Show info extended (it only works with xml output)'
+    }
+
     TEMPLATE_OPTIONS_VM   = [TEMPLATE_NAME_VM] + TEMPLATE_OPTIONS + [DRY]
 
     CAPACITY_OPTIONS_VM   = [TEMPLATE_OPTIONS[0], TEMPLATE_OPTIONS[1],
@@ -399,7 +405,7 @@ EOT
     UPDATECONF_OPTIONS_VM = TEMPLATE_OPTIONS[6..15] + [TEMPLATE_OPTIONS[2],
       TEMPLATE_OPTIONS[17], TEMPLATE_OPTIONS[18]]
 
-    OPTIONS = XML, NUMERIC, KILOBYTES
+    OPTIONS = XML, EXTENDED, NUMERIC, KILOBYTES
 
     class OneHelper
         attr_accessor :client
@@ -593,7 +599,7 @@ EOT
                 size = $stdout.winsize[0] - 1
 
                 # ----------- First page, check if pager is needed -------------
-                rc = pool.get_page(size, 0)
+                rc = pool.get_page(size, 0, false)
                 ps = ""
 
                 return -1, rc.message if OpenNebula.is_error?(rc)
@@ -621,7 +627,7 @@ EOT
                 options[:noheader] = true
 
                 loop do
-                    rc = pool.get_page(size, current)
+                    rc = pool.get_page(size, current, false)
 
                     return -1, rc.message if OpenNebula.is_error?(rc)
 
@@ -666,11 +672,13 @@ EOT
         # List pool in XML format, pagination is used in interactive output
         #-----------------------------------------------------------------------
         def list_pool_xml(pool, options, filter_flag)
+            extended = options.include?(:extended) && options[:extended]
+
             if $stdout.isatty
                 size = $stdout.winsize[0] - 1
 
                 # ----------- First page, check if pager is needed -------------
-                rc = pool.get_page(size, 0)
+                rc = pool.get_page(size, 0, extended)
                 ps = ""
 
                 return -1, rc.message if OpenNebula.is_error?(rc)
@@ -698,7 +706,7 @@ EOT
                 current = size
 
                 loop do
-                    rc = pool.get_page(size, current)
+                    rc = pool.get_page(size, current, extended)
 
                     return -1, rc.message if OpenNebula.is_error?(rc)
 
@@ -717,7 +725,11 @@ EOT
 
                 stop_pager(ppid)
             else
-                rc = pool.info
+                if pool.pool_name == "VM_POOL" && extended
+                    rc = pool.info_all_extended
+                else
+                    rc = pool.info
+                end
 
                 return -1, rc.message if OpenNebula.is_error?(rc)
 

data/lib/one_helper/oneprovision_helper.rb

@@ -93,12 +93,12 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
         provision.configure(force)
     end
 
-    def delete(provision_id, cleanup)
+    def delete(provision_id, cleanup, timeout)
         provision = OneProvision::Provision.new(provision_id)
 
         provision.refresh
 
-        provision.delete(cleanup)
+        provision.delete(cleanup, timeout)
     end
 
     #######################################################################

data/lib/one_helper/onevm_helper.rb

@@ -117,32 +117,36 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
     WEEKLY = {
         :name       => "weekly",
         :large      => "--weekly days",
-        :description => "Schedules this action to be executed after" \
-        "the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"",
+        :description => "Repeats the schedule action the days of the week specified," \
+        "it can be a number between 0,6 separated with commas." \
+        "For example: onevm resume 0 --schedule \"09/23 14:15\" --weekly 0,2,4",
         :format     => String
     }
 
     MONTHLY = {
         :name       => "monthly",
         :large      => "--monthly days",
-        :description => "Schedules this action to be executed after" \
-        "the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"",
+        :description => "Repeats the schedule action the days of the month specified," \
+        "it can be a number between 0,31 separated with commas." \
+        "For example: onevm resume 0 --schedule \"09/23 14:15\" --monthly 0,14",
         :format     => String
     }
 
     YEARLY = {
         :name       => "yearly",
         :large      => "--yearly days",
-        :description => "Schedules this action to be executed after" \
-        "the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"",
+        :description => "Repeats the schedule action the days of the year specified," \
+        "it can be a number between 0,365 separated with commas." \
+        "For example: onevm resume 0 --schedule \"09/23 14:15\" --yearly 30,60",
         :format     => String
     }
 
     HOURLY = {
         :name       => "hourly",
         :large      => "--hourly hour",
-        :description => "Schedules this action to be executed after" \
-        "the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"",
+        :description => "Repeats the schedule action each hours specified," \
+        "it can be a number between 0,168 separated with commas." \
+        "For example: onevm resume 0 --schedule \"09/23 14:15\" --hourly 1,5",
         :format     => Numeric
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.8.0
+  version: 5.8.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: 5.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: 5.8.1
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables: