opennebula-cli 5.12.13 → 5.13.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e1339016807784d2563695e736896cff9b34c6ac0ada98d0468d6a106a3736d1
-  data.tar.gz: d11bf3c46118f01421788be84eb08a37b95ec6b746c4ed23c416545ed0e647d7
+SHA1:
+  metadata.gz: 133ad6e159617025214647d52dbcb5d41f3093cf
+  data.tar.gz: 11cdb1ed429159108f9374034cf3fbe7a7866b8c
 SHA512:
-  metadata.gz: 84059bd06effa9fe8a51a6821a68119ee7f5e7359cf9d6a7d10ec7533f99c5cb92ab6e67e2feb509a1494453c6091f63377c415d5948dc1a6511168bf04d4d98
-  data.tar.gz: 138d2f21a5d82cf6532327bb2f83ab92513fba3b5b7204c918a3841bf697caba6c454f76a97df2860c5b67f517518b9db88fe4b83fc549b5e45ff8f3bd0ec619
+  metadata.gz: b6450713483ad56c4eea014eb294043d0c83b6d29175c5c123a50e854bc5b08ffc9ecfe034dd19b7dc04655b6581152d047df29e475fdbd16bb812ee9b3701cf
+  data.tar.gz: 2633fb675faf36ec1c5d7bf20c57ecaf22f2af9404a5141a7310049108574f2e41b75f260936aa4e9109051ad600341605f350ccd2beeb9d5c61e2bb4e4a0657

data/bin/oneacct

@@ -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'
@@ -123,12 +112,14 @@ CommandParser::CmdParser.new(ARGV) do
                 puts xml_str
             end
         else
+            # rubocop:disable Naming/VariableNumber
             order_by = {}
             order_by[:order_by_1] = 'VM/UID'
 
             if options[:split] && !options[:csv]
                 order_by[:order_by_2] = 'VM/ID'
             end
+            # rubocop:enable Naming/VariableNumber
 
             acct_hash = pool.accounting(filter_flag,
                                         common_opts.merge(order_by))

data/bin/oneacl

@@ -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'
@@ -117,7 +106,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :list, list_desc, :options => [CLIHelper::OPTIONS,
-                                           OpenNebulaHelper::XML,
+                                           OpenNebulaHelper::FORMAT,
                                            OpenNebulaHelper::DESCRIBE] do
         helper.list_pool(options)
     end

data/bin/onecluster

@@ -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'
@@ -67,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
 
@@ -133,7 +122,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :clusterid,
-            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
+            :options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 

data/bin/onedatastore

@@ -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'
@@ -68,8 +57,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
 
@@ -175,7 +164,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :datastoreid,
-            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
+            :options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 

data/bin/oneflow

@@ -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,30 +26,20 @@ 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'
 
 require 'json'
+require 'tempfile'
 
 require 'command_parser'
 require 'opennebula/oneflow_client'
@@ -68,12 +58,6 @@ CommandParser::CmdParser.new(ARGV) do
     set :option, CommandParser::VERSION
     set :option, CommandParser::HELP
 
-    DONE = {
-        :name => 'done',
-        :large => '--done',
-        :description => 'Show services in DONE state'
-    }
-
     ARGS = {
         :name => 'args',
         :large => '--args arg1,arg2',
@@ -127,7 +111,7 @@ CommandParser::CmdParser.new(ARGV) do
         List the available services
     EOT
 
-    command :list, list_desc, :options => [Service::JSON_FORMAT, DONE] do
+    command :list, list_desc, :options => OpenNebulaHelper::FORMAT do
         helper.list_service_pool(helper.client(options), options)
     end
 
@@ -137,7 +121,7 @@ CommandParser::CmdParser.new(ARGV) do
         Top the available services
     EOT
 
-    command :top, top_desc, :options => [CLIHelper::DELAY, DONE] do
+    command :top, top_desc, :options => [CLIHelper::DELAY] do
         Signal.trap('INT') { exit(-1) }
 
         helper.top_service_pool(helper.client(options), options)
@@ -151,7 +135,10 @@ CommandParser::CmdParser.new(ARGV) do
         Show detailed information of a given service
     EOT
 
-    command :show, show_desc, :service_id, :options => Service::JSON_FORMAT do
+    command :show,
+            show_desc,
+            :service_id,
+            :options => OpenNebulaHelper::FORMAT do
         helper.format_resource(helper.client(options), args[0], options)
     end
 
@@ -359,4 +346,75 @@ CommandParser::CmdParser.new(ARGV) do
             client.post("#{RESOURCE_PATH}/#{service_id}/action", json)
         end
     end
+
+    ###
+
+    update_desc = <<-EOT.unindent
+        Update the template contents. If a path is not provided the editor will
+        be launched to modify the current content.
+    EOT
+
+    command :update, update_desc, :service_id, [:file, nil] do
+        service_id = args[0]
+        client     = helper.client(options)
+
+        if args[1]
+            path = args[1]
+        else
+            response = client.get("#{RESOURCE_PATH}/#{service_id}")
+
+            if CloudClient.is_error?(response)
+                exit_with_code response.code.to_i, response.to_s
+            else
+                document = JSON.parse(response.body)['DOCUMENT']
+                template = document['TEMPLATE']['BODY']
+
+                tmp  = Tempfile.new(service_id.to_s)
+                path = tmp.path
+
+                tmp.write(JSON.pretty_generate(template))
+                tmp.flush
+
+                if ENV['EDITOR']
+                    editor_path = ENV['EDITOR']
+                else
+                    editor_path = OpenNebulaHelper::EDITOR_PATH
+                end
+
+                system("#{editor_path} #{path}")
+
+                unless $CHILD_STATUS.exitstatus.zero?
+                    STDERR.puts 'Editor not defined'
+                    exit(-1)
+                end
+
+                tmp.close
+            end
+        end
+
+        response = client.put("#{RESOURCE_PATH}/#{service_id}", File.read(path))
+
+        if CloudClient.is_error?(response)
+            [response.code.to_i, response.to_s]
+        else
+            0
+        end
+    end
+
+    ###
+
+    purge_done_desc = <<-EOT.unindent
+        Purge and delete services in DONE state
+    EOT
+
+    command :'purge-done', purge_done_desc do
+        client   = helper.client(options)
+        response = client.post('/service_pool/purge_done', '')
+
+        if CloudClient.is_error?(response)
+            exit_with_code response.code.to_i, response.to_s
+        else
+            0
+        end
+    end
 end

data/bin/oneflow-template

@@ -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    #
@@ -28,25 +28,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 << ONEFLOW_LOCATION
@@ -90,6 +79,20 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Clone the template recursively (just templates)'
     }
 
+    DELETE_TEMPLATES = {
+        :name => 'delete_templates',
+        :large => '--delete-vm-templates',
+        :description => 'Delete associated VM templates when deleting ' \
+                        'service template'
+    }
+
+    DELETE_IMAGES = {
+        :name => 'delete_images',
+        :large => '--delete-images',
+        :description => 'Delete associated VM templates and images when ' \
+                        'deleting service template'
+    }
+
     usage '`oneflow-template` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
@@ -127,7 +130,7 @@ CommandParser::CmdParser.new(ARGV) do
         List the available Service Templates
     EOT
 
-    command :list, list_desc, :options => Service::JSON_FORMAT do
+    command :list, list_desc, :options => OpenNebulaHelper::FORMAT do
         helper.list_service_template_pool(helper.client(options), options)
     end
 
@@ -155,7 +158,10 @@ CommandParser::CmdParser.new(ARGV) do
         Show detailed information of a given Service Template
     EOT
 
-    command :show, show_desc, :templateid, :options => Service::JSON_FORMAT do
+    command :show,
+            show_desc,
+            :templateid,
+            :options => OpenNebulaHelper::FORMAT do
         helper.format_resource(helper.client(options), args[0], options)
     end
 
@@ -188,11 +194,28 @@ CommandParser::CmdParser.new(ARGV) do
         Delete a given Service Template
     EOT
 
-    command :delete, delete_desc, [:range, :templateid_list] do
+    command :delete,
+            delete_desc,
+            [:range, :templateid_list],
+            :options => [DELETE_TEMPLATES, DELETE_IMAGES] do
         client = helper.client(options)
 
+        # :templates => delete just VM templates
+        # :all       => delete VM templates and images
+        # :none      => do not delete anything
+        if options.key?(:delete_templates)
+            delete = 'templates'
+        elsif options.key?(:delete_images)
+            delete = 'all'
+        else
+            delete = 'none'
+        end
+
+        body                = {}
+        body['delete_type'] = delete
+
         Service.perform_actions(args[0]) do |template_id|
-            client.delete("#{RESOURCE_PATH}/#{template_id}")
+            client.delete("#{RESOURCE_PATH}/#{template_id}", body.to_json)
         end
     end
 
@@ -202,26 +225,26 @@ CommandParser::CmdParser.new(ARGV) do
         Instantiate a Service Template
     EOT
 
-    command :instantiate, instantiate_desc, :templateid, [:file, nil],
+    command :instantiate,
+            instantiate_desc,
+            :templateid,
+            [:file, nil],
             :options => [MULTIPLE, Service::JSON_FORMAT, Service::TOP] do
         number = options[:multiple] || 1
         params = {}
         rc     = 0
-        client = helper.client(options)
 
         number.times do
             params['merge_template'] = nil
             params['merge_template'] = JSON.parse(File.read(args[1])) if args[1]
 
             unless params['merge_template']
-                response = client.get("#{RESOURCE_PATH}/#{args[0]}")
-
-                if CloudClient.is_error?(response)
-                    rc = [response.code.to_i, response.to_s]
-                    break
-                end
+                service_template = OpenNebula::ServiceTemplate
+                                   .new_with_id(args[0],
+                                                OpenNebula::Client.new)
+                service_template.info
 
-                body = JSON.parse(response.body)['DOCUMENT']['TEMPLATE']['BODY']
+                body = JSON.parse(service_template['/DOCUMENT/TEMPLATE/BODY'])
 
                 params['merge_template'] = helper.custom_attrs(
                     body['custom_attrs']
@@ -234,6 +257,7 @@ CommandParser::CmdParser.new(ARGV) do
             end
 
             json     = Service.build_json_action('instantiate', params)
+            client   = helper.client(options)
             response = client.post("#{RESOURCE_PATH}/#{args[0]}/action", json)
 
             if CloudClient.is_error?(response)

data/bin/onegroup

@@ -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'
@@ -67,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
 
@@ -180,7 +169,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, [:groupid, nil],
-            :options => OpenNebulaHelper::XML do
+            :options => OpenNebulaHelper::FORMAT do
         group = args[0] || OpenNebula::Group::SELF
         helper.show_resource(group, options)
     end

data/bin/onehook

@@ -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'
@@ -147,8 +136,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
 
@@ -242,7 +231,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :hookid,
-            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::EXTENDED,
+            :options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::EXTENDED,
                          EXECUTION] do
         helper.show_resource(args[0], options)
     end