opennebula-cli 5.12.13 → 5.13.80.pre

data/bin/onezone

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -26,25 +26,14 @@ else
     GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
-# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-
-        # Suppress warnings from Rubygems
-        # https://github.com/OpenNebula/one/issues/5379
-        begin
-            verb = $VERBOSE
-            $VERBOSE = nil
-            require 'rubygems'
-            Gem.use_paths(real_gems_path)
-        ensure
-            $VERBOSE = verb
-        end
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
@@ -82,8 +71,8 @@ CommandParser::CmdParser.new(ARGV) do
     ########################################################################
     set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
-    list_options = CLIHelper::OPTIONS
-    list_options << OpenNebulaHelper::XML
+    list_options  = CLIHelper::OPTIONS
+    list_options += OpenNebulaHelper::FORMAT
     list_options << OpenNebulaHelper::NUMERIC
     list_options << OpenNebulaHelper::DESCRIBE
 
@@ -222,7 +211,7 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Zone
     EOT
 
-    command :show, show_desc, :zoneid, :options => OpenNebulaHelper::XML do
+    command :show, show_desc, :zoneid, :options => OpenNebulaHelper::FORMAT do
         helper.show_resource(args[0], options)
     end
 

data/lib/cli_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -61,8 +61,7 @@ module CLIHelper
                         ' ' * 31 << 'column=value pairs.' <<
                         ' ' * 31 << "Valid operators #{FILTER_OPS.join(',')}" <<
                         ' ' * 31 << 'e.g. NAME=test (match name with test)' <<
-                        ' ' * 31 << 'NAME~test (match every NAME containing' <<
-                        ' ' * 31 << 'the substring \'test\')'
+                        ' ' * 31 << 'NAME~test (match test, te, tes..)'
     }
 
     OPERATOR = {
@@ -182,7 +181,7 @@ module CLIHelper
     ANSI_YELLOW = "\33[33m"
 
     # CLI states
-    OK_STATES      = %w[runn rdy on configured SUCCESS RUNNING]
+    OK_STATES      = %w[runn rdy on SUCCESS RUNNING]
     BAD_STATES     = %w[fail
                         err
                         error
@@ -190,7 +189,7 @@ module CLIHelper
                         FAILED_DEPLOYING
                         FAILED_UNDEPLOYING
                         FAILED_SCALING]
-    REGULAR_STATES = %w[pending WARNING]
+    REGULAR_STATES = %w[PENDING DEPLOYING CONFIGURING WARNING]
 
     # Set state color
     #
@@ -358,14 +357,14 @@ module CLIHelper
         # @param options [Hash] Object with CLI user options
         # @param top     [Boolean]     True to not update columns again
         def show(data, options = {}, top = false)
-            update_columns(options) unless top
-
             if options[:list]
                 @cli_columns = options[:list].collect {|o| o.upcase.to_sym }
             else
                 @cli_columns = @default_columns
             end
 
+            update_columns(options) unless top
+
             if data.is_a? Hash
                 @data = data
 
@@ -600,9 +599,7 @@ module CLIHelper
                 end
             end
 
-            if options
-                filter_data!(res_data, options) if options[:filter]
-            end
+            filter_data!(res_data, options) if options && options[:filter]
 
             res_data
         end

data/lib/command_parser.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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/oneacct_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -91,28 +91,19 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :format => String
     }
 
-    XML = {
-        :name  => "xml",
-        :short => "-x",
-        :large => "--xml",
-        :description => "Show the resource in xml format"
-    }
-
-    JSON = {
-        :name  => "json",
-        :short => "-j",
-        :large => "--json",
-        :description => "Show the resource in json format"
-    }
-
     SPLIT={
         :name  => "split",
         :large => "--split",
         :description => "Split the output in a table for each VM"
     }
 
-    ACCT_OPTIONS     = [START_TIME_ACCT, END_TIME_ACCT, USERFILTER, GROUP, HOST, XPATH, XML, JSON, SPLIT]
-    SHOWBACK_OPTIONS = [START_TIME_SHOWBACK, END_TIME_SHOWBACK, USERFILTER, GROUP, XML, JSON]
+    ACCT_OPTIONS     = [START_TIME_ACCT, END_TIME_ACCT, USERFILTER, GROUP, HOST, XPATH, SPLIT]
+    SHOWBACK_OPTIONS = [START_TIME_SHOWBACK, END_TIME_SHOWBACK, USERFILTER, GROUP]
+
+    ACCT_OPTIONS << OpenNebulaHelper::XML
+    ACCT_OPTIONS << OpenNebulaHelper::JSON
+
+    SHOWBACK_OPTIONS += OpenNebulaHelper::FORMAT
 
     ACCT_TABLE = CLIHelper::ShowTable.new(self.table_conf("oneacct.yaml"), nil) do
         column :UID, "User ID", :size=>4 do |d|
@@ -227,15 +218,11 @@ class AcctHelper < OpenNebulaHelper::OneHelper
             d["HOURS"]
         end
 
-        column :RUNNING_HOURS, "Running hours", :size=>7 do |d|
-            d["RHOURS"] || '-'
-        end
-
         column :COST, "Cost", :size=>15 do |d|
             d["TOTAL_COST"]
         end
 
-        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :RUNNING_HOURS, :COST
+        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :COST
     end
 
     def self.print_start_end_time_header(start_time, end_time)

data/lib/one_helper/oneacl_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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/onecluster_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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/onedatastore_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -28,6 +28,16 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         }
     }
 
+    FILE_DATASTORE = {
+        :name   => "file_datastore",
+        :large  => "--file-datastore id|name" ,
+        :description => "Selects the file datastore",
+        :format => String,
+        :proc   => lambda { |o, options|
+            OpenNebulaHelper.rname_to_id(o, "DATASTORE")
+        }
+    }
+
     def self.rname
         "DATASTORE"
     end

data/lib/one_helper/oneflow_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -57,11 +57,18 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
                 d['NAME']
             end
 
+            column :STARTTIME, 'Start time of the Service', :size => 15 do |d|
+                d.extend(CLIHelper::HashWithSearch)
+                d = d.dsearch('TEMPLATE/BODY')
+
+                OpenNebulaHelper.time_to_str(d['start_time'])
+            end
+
             column :STAT, 'State', :size => 11, :left => true do |d|
                 Service.state_str(d['TEMPLATE']['BODY']['state'])
             end
 
-            default :ID, :USER, :GROUP, :NAME, :STAT
+            default :ID, :USER, :GROUP, :NAME, :STARTTIME, :STAT
         end
     end
 
@@ -74,6 +81,8 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
 
         if CloudClient.is_error?(response)
             [response.code.to_i, response.to_s]
+        elsif options[:yaml]
+            [0, JSON.parse(response.body).to_yaml(:indent => 4)]
         else
             array_list = JSON.parse(response.body)
             array_list = array_list['DOCUMENT_POOL']['DOCUMENT']
@@ -93,6 +102,8 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
                 else
                     [0, JSON.pretty_generate(array_list)]
                 end
+            elsif options[:yaml]
+                [0, array_list.to_yaml(:indent => 4)]
             else
                 format_service_pool.show(array_list)
 
@@ -139,6 +150,8 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
         else
             if options[:json]
                 [0, response.body]
+            elsif options[:yaml]
+                [0, JSON.parse(response.body).to_yaml(:indent => 4)]
             else
                 str_h1   = '%-80s'
                 document = JSON.parse(response.body)['DOCUMENT']
@@ -260,9 +273,10 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
     #
     # @param document [Hash] Service document information
     def print_service_info(document)
-        str      = '%-20s: %-20s'
-        str_h1   = '%-80s'
-        template = document['TEMPLATE']['BODY']
+        str        = '%-20s: %-20s'
+        str_h1     = '%-80s'
+        template   = document['TEMPLATE']['BODY']
+        start_time = OpenNebulaHelper.time_to_str(template['start_time'])
 
         puts Kernel.format(str, 'ID', document['ID'])
         puts Kernel.format(str, 'NAME', document['NAME'])
@@ -273,6 +287,7 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
         puts Kernel.format(str,
                            'SERVICE STATE',
                            Service.state_str(template['state']))
+        puts Kernel.format(str, 'START TIME', start_time)
 
         if template['shutdown_action']
             puts Kernel.format(str, 'SHUTDOWN', template['shutdown_action'])

data/lib/one_helper/oneflowtemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -57,7 +57,16 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 d['NAME']
             end
 
-            default :ID, :USER, :GROUP, :NAME
+            column :REGTIME,
+                   'Registration time of the Service Template',
+                   :size => 15 do |d|
+                d.extend(CLIHelper::HashWithSearch)
+                d = d.dsearch('TEMPLATE/BODY')
+
+                OpenNebulaHelper.time_to_str(d['registration_time'])
+            end
+
+            default :ID, :USER, :GROUP, :NAME, :REGTIME
         end
     end
 
@@ -73,6 +82,8 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
         else
             if options[:json]
                 [0, response.body]
+            elsif options[:yaml]
+                [0, JSON.parse(response.body).to_yaml(:indent => 4)]
             else
                 documents = JSON.parse(response.body)['DOCUMENT_POOL']
                 format_service_template_pool.show(documents['DOCUMENT'])
@@ -120,12 +131,17 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
         else
             if options[:json]
                 [0, response.body]
+            elsif options[:yaml]
+                [0, JSON.parse(response.body).to_yaml(:indent => 4)]
             else
                 str    = '%-20s: %-20s'
                 str_h1 = '%-80s'
 
                 document = JSON.parse(response.body)['DOCUMENT']
                 template = document['TEMPLATE']['BODY']
+                reg_time = OpenNebulaHelper.time_to_str(
+                    template['registration_time']
+                )
 
                 CLIHelper.print_header(
                     str_h1 % "SERVICE TEMPLATE #{document['ID']} INFORMATION"
@@ -135,6 +151,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 puts Kernel.format str, 'NAME', document['NAME']
                 puts Kernel.format str, 'USER', document['UNAME']
                 puts Kernel.format str, 'GROUP', document['GNAME']
+                puts Kernel.format str, 'REGISTRATION TIME', reg_time
 
                 puts
 
@@ -309,4 +326,13 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
         answers
     end
 
+    def factory(id = nil)
+        if id
+            OpenNebula::ServiceTemplate.new_with_id(id, @client)
+        else
+            xml = OpenNebula::ServiceTemplate.build_xml
+            OpenNebula::ServiceTemplate.new(xml, @client)
+        end
+    end
+
 end

data/lib/one_helper/onegroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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/onehook_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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/onehost_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -222,10 +222,6 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            column :PROVIDER, 'Host provider', :left, :size => 6 do |d|
-                d['TEMPLATE']['PM_MAD'].nil? ? '-' : d['TEMPLATE']['PM_MAD']
-            end
-
             column :STAT, 'Host status', :left, :size => 6 do |d|
                 OneHostHelper.state_to_str(d['STATE'])
             end

data/lib/one_helper/oneimage_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -22,7 +22,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
 
     # This list contains prefixes that should skip adding user home to the path
     # This must have the same content as the case $FROM in downloader.sh
-    PREFIXES = %w[http https ssh s3 rbd vcenter lxd docker]
+    PREFIXES = %w[http https ssh s3 rbd vcenter lxd docker dockerfile]
 
     TEMPLATE_OPTIONS=[
         {
@@ -98,9 +98,9 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             end
         },
         {
-            :name => 'driver',
-            :large => '--driver driver',
-            :description => 'Driver to use image (raw, qcow2, tap:aio:...)',
+            :name => 'format',
+            :large => '--format format',
+            :description => 'Format of the image (raw, qcow2, ...)',
             :format => String
         },
         {
@@ -295,7 +295,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         str_h1='%-80s'
 
         path = image['PATH']
-        fstype = image['FSTYPE']
+        iformat = image['FORMAT']
 
         size = OpenNebulaHelper.unit_to_str(image['SIZE'].to_i, {}, 'M')
         lock = OpenNebulaHelper.level_lock_to_str(image['LOCK/LOCKED'])
@@ -314,7 +314,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         puts format(str, 'PERSISTENT', pers)
         puts format(str, 'SOURCE', image['SOURCE'])
         puts format(str, 'PATH', path) if path && !path.empty?
-        puts format(str, 'FSTYPE', fstype) if fstype && !fstype.empty?
+        puts format(str, 'FORMAT', iformat) if iformat && !iformat.empty?
         puts format(str, 'SIZE', size)
         puts format(str, 'STATE', image.short_state_str)
         puts format(str, 'RUNNING_VMS', image['RUNNING_VMS'])

data/lib/one_helper/onemarket_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #