opennebula-cli 5.12.10 → 5.13.80.pre

data/bin/onevcenter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, 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    #
@@ -29,9 +29,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -257,21 +260,10 @@ CommandParser::CmdParser.new(ARGV) do
             importer = VCenterDriver::VcImporter.new_child(helper.client,
                                                            vi_client,
                                                            options[:object])
+            importer.retrieve_resources(helper.parse_opts(options))
+            indexes = importer.get_indexes(args.first)
 
-            if options[:object] == "networks" && !args.first.nil?
-                indexes = args.first
-            else
-                importer.retrieve_resources(helper.parse_opts(options))
-                indexes = importer.get_indexes(args.first)
-            end
-
-            if indexes.nil?
-                raise "Could not get any unimported #{options[:object]}"\
-                    " resources info in host: #{options[:host]} with"\
-                    " this input: #{args.first}"
-            end
-
-            importer.process_import(indexes, options)
+            importer.process_import(indexes)
 
             importer.stdout
         rescue StandardError => e

data/bin/onevdc

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -53,8 +56,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
 
@@ -297,7 +300,7 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given VDC
     EOT
 
-    command :show, show_desc, :vdcid, :options => OpenNebulaHelper::XML do
+    command :show, show_desc, :vdcid, :options => OpenNebulaHelper::FORMAT do
         helper.show_resource(args[0], options)
     end
 end

data/bin/onevm

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -37,6 +40,8 @@ $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
 require 'command_parser'
 require 'one_helper/onevm_helper'
+require 'one_helper/onedatastore_helper'
+require 'opennebula/virtual_machine_ext'
 
 CommandParser::CmdParser.new(ARGV) do
     usage '`onevm` <command> [<args>] [<options>]'
@@ -176,6 +181,32 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
+    LOGGER = {
+        :name   => 'logger',
+        :large  => '--logger logger',
+        :format => String,
+        :description => 'Set logger to STDOUT or FILE'
+    }
+
+    KEEP = {
+        :name  => 'keep',
+        :large => '--keep-backup',
+        :description => 'Keep previous backup when creating a new one'
+    }
+
+    ONESHOT = {
+        :name  => 'oneshot',
+        :large => '--oneshot',
+        :description => 'Take an snapshot of the VM without saving backup info'
+    }
+
+    MARKET = {
+        :name   => 'market',
+        :large  => '--market market_id',
+        :format => Integer,
+        :description => 'Market to save oneshot'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -1152,7 +1183,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :vmid,
-            :options => [OpenNebulaHelper::XML,
+            :options => [OpenNebulaHelper::FORMAT,
                          OpenNebulaHelper::DECRYPT,
                          OneVMHelper::ALL_TEMPLATE] do
         helper.show_resource(args[0], options)
@@ -1210,7 +1241,11 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :save, save_desc, :vmid, :name, :options => [PERSISTENT] do
         helper.perform_action(args[0], options, 'Saving VM') do |vm|
-            res = vm.save_as_template(args[1], options[:persistent])
+            vm.extend(VirtualMachineExt)
+
+            res = vm.save_as_template(args[1],
+                                      '',
+                                      :persistent => options[:persistent])
 
             if !OpenNebula.is_error?(res)
                 puts "Template ID: #{res}"
@@ -1221,15 +1256,16 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     updateconf_desc = <<-EOT.unindent
-        Updates the configuration of a VM. The VM cannot be in an active (running)
-        state, valid states are: pending, failure, poweroff, undeploy, hold or
-        cloning.
+        Updates the configuration of a VM. Valid states are: running, pending,
+        failure, poweroff, undeploy, hold or cloning.
+        In running state only changes in CONTEXT take effect immediately,
+        other values may need a VM restart.
 
         This command accepts a template file or opens an editor, the full list of
         configuration attributes are:
 
-        OS        = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT"]
-        FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT"]
+        OS        = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT", "UUID"]
+        FEATURES  = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", "IOTHREADS"]
         INPUT     = ["TYPE", "BUS"]
         GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
         RAW       = ["DATA", "DATA_VMX", "TYPE"]
@@ -1383,6 +1419,105 @@ CommandParser::CmdParser.new(ARGV) do
         0
     end
 
+    backup_vm_desc = <<-EOT.unindent
+        Creates a VM backup and stores it in the marketplace
+    EOT
+
+    command :backup,
+            backup_vm_desc,
+            :vmid,
+            :options => [LOGGER, KEEP, ONESHOT, MARKET] do
+        require 'logger'
+
+        if options.key?(:oneshot) && !options.key?(:market)
+            STDERR.puts 'ERROR: no market given'
+            exit(-1)
+        end
+
+        helper.perform_action(args[0], options, 'Backup') do |vm|
+            vm.extend(OpenNebula::VirtualMachineExt)
+
+            # If logger is specified use it, if not use STDOUT
+            options[:logger].nil? ? log_to = STDOUT : log_to = options[:logger]
+
+            # Read user options
+            keep   = options.key?(:keep)
+            logger = Logger.new(log_to)
+            format = '%Y-%m-%d %H:%M:%S'
+
+            logger.formatter = proc do |severity, datetime, _p, msg|
+                "#{datetime.strftime(format)} #{severity.ljust(5)} : #{msg}\n"
+            end
+
+            if options.key?(:oneshot)
+                binfo        = {}
+                binfo[:name] = "VM #{vm.id} BACKUP - " \
+                               "#{Time.now.strftime('%Y%m%d_%k%M')}"
+                binfo[:freq]   = 1
+                binfo[:last]   = Time.now.to_i - 100
+                binfo[:market] = options[:market]
+            end
+
+            begin
+                rc = vm.backup(keep, logger, binfo)
+
+                if OpenNebula.is_error?(rc)
+                    STDERR.puts rc.message
+                    exit(-1)
+                else
+                    0
+                end
+            rescue StandardError => e
+                STDERR.puts e
+                exit(-1)
+            end
+        end
+    end
+
+    restore_vm_desc = <<-EOT.unindent
+        Restores a VM from a previous backup
+    EOT
+
+    command :restore,
+            restore_vm_desc,
+            :vmid,
+            :options => [OneDatastoreHelper::DATASTORE, LOGGER] do
+        require 'logger'
+
+        unless options[:datastore]
+            STDERR.puts 'ERROR: no datastore given'
+            exit(-1)
+        end
+
+        helper.perform_action(args[0], options, 'Restore') do |vm|
+            vm.extend(OpenNebula::VirtualMachineExt)
+
+            # If logger is specified use it, if not use STDOUT
+            options[:logger].nil? ? log_to = STDOUT : log_to = options[:logger]
+            logger = Logger.new(log_to)
+            format = '%Y-%m-%d %H:%M:%S'
+
+            logger.formatter = proc do |severity, datetime, _p, msg|
+                "#{datetime.strftime(format)} #{severity.ljust(5)} : #{msg}\n"
+            end
+
+            begin
+                rc = vm.restore(options[:datastore], logger)
+
+                if OpenNebula.is_error?(rc)
+                    STDERR.puts rc.message
+                    exit(-1)
+                else
+                    puts "ID: #{rc}"
+                    0
+                end
+            rescue StandardError => e
+                STDERR.puts e
+                exit(-1)
+            end
+        end
+    end
+
     # Deprecated commands
 
     deprecated_command(:shutdown, 'terminate')

data/bin/onevmgroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -77,8 +80,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
 
@@ -148,7 +151,10 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given VM Group
     EOT
 
-    command :show, show_desc, :vmgroupid, :options => OpenNebulaHelper::XML do
+    command :show,
+            show_desc,
+            :vmgroupid,
+            :options => OpenNebulaHelper::FORMAT do
         helper.show_resource(args[0], options)
     end
 

data/bin/onevnet

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -320,7 +323,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :vnetid,
-            :options => [OpenNebulaHelper::XML,
+            :options => [OpenNebulaHelper::FORMAT,
                          OpenNebulaHelper::DECRYPT,
                          OneVNetHelper::SHOW_AR] do
         helper.show_resource(args[0], options)

data/bin/onevntemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -78,8 +81,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
 
@@ -313,7 +316,8 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :templateid,
-            :options => [OpenNebulaHelper::XML, OneTemplateHelper::EXTENDED] do
+            :options => [OpenNebulaHelper::FORMAT,
+                         OneTemplateHelper::EXTENDED] do
         helper.show_resource(args[0], options)
     end
 

data/bin/onevrouter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -79,8 +82,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
 
@@ -339,7 +342,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :vrouterid,
-            :options => [OpenNebulaHelper::XML, OneVMHelper::ALL_TEMPLATE] do
+            :options => [OpenNebulaHelper::FORMAT, OneVMHelper::ALL_TEMPLATE] do
         helper.show_resource(args[0], options)
     end
 

data/bin/onezone

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -68,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
 
@@ -208,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-2020, 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    #
@@ -181,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
@@ -189,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
     #
@@ -599,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-2020, 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-2020, 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|

data/lib/one_helper/oneacl_helper.rb

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