opennebula-cli 5.12.9 → 6.0.0.1

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
@@ -54,7 +57,7 @@ CommandParser::CmdParser.new(ARGV) do
     }
 
     DATABASE = {
-        :name  => 'database',
+        :name  => 'db',
         :large => '--db',
         :description => 'Also sync database'
     }
@@ -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
     #
@@ -211,6 +211,17 @@ module CLIHelper
         end
     end
 
+    # Get text in green colour
+    #
+    # @param text [String] String to print
+    def self.green(text)
+        if $stdout.tty?
+            ANSI_GREEN + text + ANSI_RESET
+        else
+            text
+        end
+    end
+
     # Print header
     #
     # @param str       [String]  String with header content
@@ -357,14 +368,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
 
@@ -599,9 +610,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    #
@@ -481,9 +481,12 @@ module CommandParser
                 begin
                     rc = comm[:proc].call
 
-                    if rc.instance_of?(Array)
+                    if rc.instance_of?(Array) && rc[0] != 0
+                        STDERR.puts rc[1]
+                        exit(rc[0])
+                    elsif rc.instance_of?(Array)
                         puts rc[1]
-                        exit rc.first
+                        exit(rc[0])
                     else
                         exit(@exit_code || rc)
                     end
@@ -537,7 +540,7 @@ module CommandParser
             begin
                 @cmdparse.parse!(@args)
             rescue => e
-                puts e.message
+                STDERR.puts e.message
                 exit -1
             end
 
@@ -547,8 +550,8 @@ module CommandParser
                     if rc[0] == 0
                         @options[e[:name].to_sym] = rc[1]
                     else
-                        puts rc[1]
-                        puts "option #{e[:name]}: Parsing error"
+                        STDERR.puts rc[1]
+                        STDERR.puts "option #{e[:name]}: Parsing error"
                         exit -1
                     end
                 end
@@ -557,11 +560,11 @@ module CommandParser
 
         def check_args!(name, arity, args_format)
             if @args.length < arity
-                print "Command #{name} requires "
+                STDERR.print "Command #{name} requires "
                 if arity>1
-                    puts "#{args_format.length} parameters to run."
+                    STDERR.puts "#{args_format.length} parameters to run."
                 else
-                    puts "one parameter to run"
+                    STDERR.puts "one parameter to run"
                 end
 
                 print_command_help(name)
@@ -579,11 +582,11 @@ module CommandParser
                             end
                         }.join(' ')
 
-                        puts "Wrong number of arguments"
+                        STDERR.puts "Wrong number of arguments"
                         if args_str.empty?
-                            puts "No argument is required"
+                            STDERR.puts "No argument is required"
                         else
-                            puts "The arguments should be: #{args_str}"
+                            STDERR.puts "The arguments should be: #{args_str}"
                         end
                         exit -1
                     end
@@ -613,9 +616,9 @@ module CommandParser
 
                     unless argument
                         if error_msg
-                            puts error_msg
+                            STDERR.puts error_msg
                         else
-                            puts "command #{name}: argument #{id} must be one of #{format.join(', ')}"
+                            STDERR.puts "command #{name}: argument #{id} must be one of #{format.join(', ')}"
                         end
                         exit -1
                     end

data/lib/one_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    #
@@ -30,17 +30,19 @@ include OpenNebula
 module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
-Copyright 2002-2020, OpenNebula Project, OpenNebula Systems
+Copyright 2002-2021, OpenNebula Project, OpenNebula Systems
 EOT
 
     if ONE_LOCATION
-        TABLE_CONF_PATH=ONE_LOCATION+"/etc/cli"
-        VAR_LOCATION=ONE_LOCATION+"/var" if !defined?(VAR_LOCATION)
-        CLI_ADDONS_LOCATION=ONE_LOCATION+"/lib/ruby/cli/addons"
+        TABLE_CONF_PATH     = ONE_LOCATION + "/etc/cli"
+        VAR_LOCATION        = ONE_LOCATION + "/var" if !defined?(VAR_LOCATION)
+        CLI_ADDONS_LOCATION = ONE_LOCATION + "/lib/ruby/cli/addons"
+        XSD_PATH            = ONE_LOCATION + '/share/schemas/xsd'
     else
-        TABLE_CONF_PATH="/etc/one/cli"
-        VAR_LOCATION="/var/lib/one" if !defined?(VAR_LOCATION)
-        CLI_ADDONS_LOCATION="/usr/lib/one/ruby/cli/addons"
+        TABLE_CONF_PATH     = "/etc/one/cli"
+        VAR_LOCATION        = "/var/lib/one" if !defined?(VAR_LOCATION)
+        CLI_ADDONS_LOCATION = "/usr/lib/one/ruby/cli/addons"
+        XSD_PATH            = '/usr/share/one/schemas/xsd'
     end
 
     EDITOR_PATH='/usr/bin/vi'
@@ -55,6 +57,23 @@ EOT
         :description => "Show the resource in xml format"
     }
 
+    JSON = {
+        :name => 'json',
+        :short => '-j',
+        :large => '--json',
+        :description => 'Show the resource in JSON format',
+        :proc        => lambda do |_, _|
+            require 'json'
+        end
+    }
+
+    YAML = {
+        :name => 'yaml',
+        :short => '-y',
+        :large => '--yaml',
+        :description => 'Show the resource in YAML format'
+    }
+
     NUMERIC={
         :name  => "numeric",
         :short => "-n",
@@ -428,7 +447,9 @@ EOT
     UPDATECONF_OPTIONS_VM = TEMPLATE_OPTIONS[6..15] + [TEMPLATE_OPTIONS[2],
       TEMPLATE_OPTIONS[17], TEMPLATE_OPTIONS[18]]
 
-    OPTIONS = XML, EXTENDED, NUMERIC, KILOBYTES
+    FORMAT = [XML, JSON, YAML]
+
+    OPTIONS = FORMAT, EXTENDED, NUMERIC, KILOBYTES
 
     class OneHelper
         attr_accessor :client
@@ -590,12 +611,10 @@ EOT
         end
 
         def print_page(pool, options)
-            page = nil
+            elements = 0
+            page     = ""
 
             if options[:xml]
-                elements = 0
-                page     = ""
-
                 pool.each {|e|
                     elements += 1
                     page << e.to_xml(true) << "\n"
@@ -604,8 +623,15 @@ EOT
                 pname = pool.pool_name
                 ename = pool.element_name
 
-                page  = pool.to_hash
-                elems = page["#{pname}"]["#{ename}"]
+                if options[:decrypt]
+                    page = pool.map do |element|
+                        element.info(true)
+                        element.to_hash[ename]
+                    end
+                else
+                    page  = pool.to_hash
+                    elems = page[pname][ename]
+                end
 
                 if elems.class == Array
                     elements = elems.length
@@ -626,7 +652,7 @@ EOT
                 size = $stdout.winsize[0] - 1
 
                 # ----------- First page, check if pager is needed -------------
-                rc = pool.get_page(size, 0, false)
+                rc = pool.get_page(size, 0, false, options[:state])
                 ps = ""
 
                 return -1, rc.message if OpenNebula.is_error?(rc)
@@ -654,7 +680,7 @@ EOT
                 options[:no_header] = true
 
                 loop do
-                    rc = pool.get_page(size, current, false)
+                    rc = pool.get_page(size, current, false, options[:state])
 
                     return -1, rc.message if OpenNebula.is_error?(rc)
 
@@ -677,19 +703,20 @@ EOT
 
                 stop_pager(ppid)
             else
-                array = pool.get_hash
-                return -1, array.message if OpenNebula.is_error?(array)
+                rc = pool.info
 
-                rname    = self.class.rname
-                elements = array["#{rname}_POOL"][rname]
+                return -1, rc.message if OpenNebula.is_error?(rc)
+
+                elements, hash = print_page(pool, options)
 
-               if options[:ids] && elements
-                    elements.reject! do |element|
+                if options[:ids] && elements
+                    arr = [hash[pool.pool_name][pool.element_name]].flatten
+                    arr.reject! do |element|
                         !options[:ids].include?(element['ID'].to_i)
                     end
                 end
 
-                table.show(array, options)
+                table.show(hash, options)
             end
 
             return 0
@@ -705,7 +732,7 @@ EOT
                 size = $stdout.winsize[0] - 1
 
                 # ----------- First page, check if pager is needed -------------
-                rc = pool.get_page(size, 0, extended)
+                rc = pool.get_page(size, 0, extended, options[:state])
                 ps = ""
 
                 return -1, rc.message if OpenNebula.is_error?(rc)
@@ -740,7 +767,7 @@ EOT
                 current = size
 
                 loop do
-                    rc = pool.get_page(size, current, extended)
+                    rc = pool.get_page(size, current, extended, options[:state])
 
                     return -1, rc.message if OpenNebula.is_error?(rc)
 
@@ -779,6 +806,82 @@ EOT
             return 0
         end
 
+        #-----------------------------------------------------------------------
+        # List pool in JSON format, pagination is used in interactive output
+        #-----------------------------------------------------------------------
+        def list_pool_format(pool, options, filter_flag)
+            extended = options.include?(:extended) && options[:extended]
+
+            if $stdout.isatty and (!options.key?:no_pager)
+                size = $stdout.winsize[0] - 1
+
+                # ----------- First page, check if pager is needed -------------
+                rc = pool.get_page(size, 0, extended, options[:state])
+                ps = ""
+
+                return -1, rc.message if OpenNebula.is_error?(rc)
+
+                elements = get_format_size(pool, options)
+                ppid     = -1
+
+                if elements >= size
+                    ppid = start_pager
+                end
+
+                yield(pool) if block_given?
+
+                if elements < size
+                    return 0
+                end
+
+                if elements < size
+                    return 0
+                elsif !pool.is_paginated?
+                    stop_pager(ppid)
+                    return 0
+                end
+
+                # ------- Rest of the pages in the pool, piped to pager --------
+                current = size
+
+                loop do
+                    rc = pool.get_page(size, current, extended, options[:state])
+
+                    return -1, rc.message if OpenNebula.is_error?(rc)
+
+                    current += size
+
+                    begin
+                        Process.waitpid(ppid, Process::WNOHANG)
+                    rescue Errno::ECHILD
+                        break
+                    end
+
+                    elements = get_format_size(pool, options)
+
+                    break if elements < size
+
+                    yield(pool) if block_given?
+
+                    $stdout.flush
+                end
+
+                stop_pager(ppid)
+            else
+                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)
+
+                yield(pool) if block_given?
+            end
+
+            return 0
+        end
+
         #-----------------------------------------------------------------------
         # List pool table in top-like form
         #-----------------------------------------------------------------------
@@ -807,11 +910,27 @@ EOT
             filter_flag ||= OpenNebula::Pool::INFO_ALL
 
             pool  = factory_pool(filter_flag)
+            pname = pool.pool_name
+            ename = pool.element_name
 
             if top
                 return list_pool_top(table, pool, options)
             elsif options[:xml]
                 return list_pool_xml(pool, options, filter_flag)
+            elsif options[:json]
+                list_pool_format(pool, options, filter_flag) do |pool|
+                    hash        = check_resource_xsd(pool, pname)
+                    hash[pname] = check_resource_xsd(hash[pname], ename)
+
+                    puts ::JSON.pretty_generate(hash)
+                end
+            elsif options[:yaml]
+                list_pool_format(pool, options, filter_flag) do |pool|
+                    hash        = check_resource_xsd(pool, pname)
+                    hash[pname] = check_resource_xsd(hash[pname], ename)
+
+                    puts hash.to_yaml(:indent => 4)
+                end
             else
                 return list_pool_table(table, pool, options, filter_flag)
             end
@@ -855,6 +974,17 @@ EOT
 
             if options[:xml]
                 return 0, resource.to_xml(true)
+            elsif options[:json]
+                # If body is set, the resource contains a JSON inside
+                if options[:body]
+                    return 0, check_resource_xsd(resource)
+                else
+                    return 0, ::JSON.pretty_generate(
+                        check_resource_xsd(resource)
+                    )
+                end
+            elsif options[:yaml]
+                return 0, check_resource_xsd(resource).to_yaml(:indent => 4)
             else
                 format_resource(resource, options)
                 return 0
@@ -881,7 +1011,7 @@ EOT
                 rc = perform_action(id,options,verbose,&block)
 
                 unless rc[0]==0
-                    puts rc[1]
+                    STDERR.puts rc[1]
                     exit_code=rc[0]
                 end
             end
@@ -1064,6 +1194,199 @@ EOT
 
             return 0, pool
         end
+
+        def get_format_size(pool, options)
+            if options[:json]
+                ::JSON.pretty_generate(pool.to_hash).split("\n").size
+            elsif options[:yaml]
+                pool.to_hash.to_yaml.split("\n").size
+            else
+                STDERR.puts 'ERROR: Format not found'
+                exit(-1)
+            end
+        end
+
+        ########################################################################
+        # XSD check and fix
+        ########################################################################
+
+        # Check XSD values for a single resource
+        #
+        # @param resource [OpenNebula::Object] Resource to check
+        # @param ename    [String]             Resource name
+        #
+        # @return [Object] Hash with correct values
+        def check_resource_xsd(resource, ename = nil)
+            hash  = resource.to_hash
+            ename = hash.keys.first unless ename
+            xsd   = read_xsd(ename)
+
+            return hash unless xsd
+
+            hash[ename] = check_xsd(hash[ename], nil, ename, xsd)
+
+            hash
+        end
+
+        # Read XSD file and parse to XML
+        #
+        # @param ename [String] Element name to read XSD
+        #
+        # @return [Hash] XSD in hash format, nil if not found
+        def read_xsd(ename)
+            require 'active_support/core_ext/hash/conversions'
+
+            # Try GEM directory
+            file = File.expand_path(
+                "../share/schemas/xsd/#{ename.downcase}.xsd",
+                File.dirname(__FILE__)
+            )
+
+            file = "#{XSD_PATH}/#{ename.downcase}.xsd" unless File.exist?(file)
+
+            unless File.exist?(file)
+                STDERR.puts "WARNING: XSD for #{ename} not found, skipping check"
+                return nil
+            end
+
+            hash = Hash.from_xml(Nokogiri::XML(File.read(file)).to_s)
+            hash = hash['schema']['element']
+
+            if hash.keys.include?('complexType')
+                hash['complexType']['sequence']['element']
+            else
+                hash['element']
+            end
+        end
+
+        # Check values XSD
+        #
+        # @param hash     [Object] Resource information in hash format
+        # @param elements [Array]  Keys to check
+        # @param ename    [String] Element name to take XSD
+        # @param xsd      [Hash]   XSD file content
+        # @param parents  [Array]  Parent keys of current hash
+        def check_xsd(hash, elements, ename, xsd, parents = [])
+            return unless hash
+
+            if (hash.is_a? Hash) && !hash.empty?
+                hash.map do |ki, vi|
+                    vi = [vi].flatten if is_array?(xsd, [ki])
+
+                    if (vi.is_a? Hash) && !vi.empty?
+                        parents << ki
+
+                        vi.map do |kj, vj|
+                            parents << kj
+
+                            path = (parents + [ki, kj]).uniq
+                            vj   = [vj].flatten if is_array?(xsd, path)
+
+                            hash[ki][kj] = check_xsd(vj,
+                                                     [ki, kj],
+                                                     ename,
+                                                     xsd,
+                                                     parents)
+                        end
+
+                        parents.clear
+                    elsif vi.is_a? Array
+                        hash[ki] = check_xsd(vi, [ki], ename, xsd, parents)
+                    else
+                        hash[ki] = check_xsd(vi, [ki], ename, xsd, parents)
+                    end
+                end
+
+                hash
+            elsif hash.is_a? Array
+                ret = []
+
+                hash.each do |v|
+                    ret << check_xsd(v, elements, ename, xsd, parents)
+                end
+
+                ret
+            else
+                check_type(hash) do
+                    type = get_xsd_path(xsd, elements)
+                    type['type'] unless type.nil?
+                end
+            end
+        end
+
+        # Get xsd path value
+        #
+        # @param xsd      [Hash]  XSD information
+        # @param elements [Array] Path to get
+        #
+        # @return [Hash] Path information
+        def get_xsd_path(xsd, elements)
+            return unless elements
+
+            element = elements.shift
+
+            # Return nil, because is an empty complexType
+            return unless element
+
+            element = [xsd].flatten.find do |v|
+                v['name'] == element || v['ref'] == element
+            end
+
+            # Return nil, because element was not find in XSD
+            return unless element
+
+            if element.keys.include?('complexType') && !elements.empty?
+                if element['complexType']['all']
+                    element = element['complexType']['all']['element']
+                else
+                    element = element['complexType']['sequence']['element']
+                end
+
+                get_xsd_path(element, elements)
+            else
+                element
+            end
+        end
+
+        # CHeck if current element is an array
+        #
+        # @param xsd      [Hash]  XSD information
+        # @param elements [Array] Path to check
+        #
+        # @return [Boolean] True if it's an array, false otherwise
+        def is_array?(xsd, elements)
+            max = get_xsd_path(xsd, elements)
+            max = max['maxOccurs'] if max
+
+            max == 'unbounded' || max.to_i > 1
+        end
+
+        # Check XSD type for especific value
+        #
+        # @param value [Object] Value to check
+        #
+        # @return [Object] nil if the type is not correct, value otherwise
+        def check_type(value)
+            type = yield if block_given?
+
+            # If there is no type, return current value
+            return value unless type
+
+            types = %w[string decimal integer boolean date time]
+            type  = type.split(':')[1]
+
+            if types.include?(type)
+                # If the current type is different, return string
+                # because this value doesn't respect the type
+                if (value.is_a? Hash) || (value.is_a? Array)
+                    ''
+                else
+                    value
+                end
+            else
+                value
+            end
+        end
     end
 
     def OpenNebulaHelper.rname_to_id(name, poolname)
@@ -1072,18 +1395,20 @@ EOT
         client=OneHelper.client
 
         pool = case poolname
-        when "HOST"        then OpenNebula::HostPool.new(client)
-        when "HOOK"        then OpenNebula::HookPool.new(client)
-        when "GROUP"       then OpenNebula::GroupPool.new(client)
-        when "USER"        then OpenNebula::UserPool.new(client)
-        when "DATASTORE"   then OpenNebula::DatastorePool.new(client)
-        when "CLUSTER"     then OpenNebula::ClusterPool.new(client)
-        when "VNET"        then OpenNebula::VirtualNetworkPool.new(client)
-        when "IMAGE"       then OpenNebula::ImagePool.new(client)
-        when "VMTEMPLATE"  then OpenNebula::TemplatePool.new(client)
-        when "VM"          then OpenNebula::VirtualMachinePool.new(client)
-        when "ZONE"        then OpenNebula::ZonePool.new(client)
-        when "MARKETPLACE" then OpenNebula::MarketPlacePool.new(client)
+        when "HOST"          then OpenNebula::HostPool.new(client)
+        when "HOOK"          then OpenNebula::HookPool.new(client)
+        when "GROUP"         then OpenNebula::GroupPool.new(client)
+        when "USER"          then OpenNebula::UserPool.new(client)
+        when "DATASTORE"     then OpenNebula::DatastorePool.new(client)
+        when "CLUSTER"       then OpenNebula::ClusterPool.new(client)
+        when "VNET"          then OpenNebula::VirtualNetworkPool.new(client)
+        when "IMAGE"         then OpenNebula::ImagePool.new(client)
+        when "VMTEMPLATE"    then OpenNebula::TemplatePool.new(client)
+        when "VNTEMPLATES"   then OpenNebula::VNTemplatePool.new(client)
+        when "VM"            then OpenNebula::VirtualMachinePool.new(client)
+        when "ZONE"          then OpenNebula::ZonePool.new(client)
+        when "MARKETPLACE"   then OpenNebula::MarketPlacePool.new(client)
+        when "FLOWTEMPLATES" then OpenNebula::ServiceTemplatePool.new(client)
         end
 
         rc = pool.info
@@ -1269,6 +1594,43 @@ EOT
         end
     end
 
+    def OpenNebulaHelper.update_obj(obj, file, plain = false)
+        rc = obj.info(true)
+
+        return rc if OpenNebula.is_error?(rc)
+
+        if file
+            path = file
+        else
+            tmp  = Tempfile.new(obj['ID'])
+            path = tmp.path
+
+            tmp.write(yield(obj)) if block_given?
+            tmp.flush
+
+            if ENV['EDITOR']
+                editor_path = ENV['EDITOR']
+            else
+                editor_path = EDITOR_PATH
+            end
+
+            system("#{editor_path} #{path}")
+
+            unless $CHILD_STATUS.exitstatus.zero?
+                STDERR.puts 'Editor not defined'
+                exit(-1)
+            end
+
+            tmp.close
+        end
+
+        if plain
+            obj.update(File.read(path), plain)
+        else
+            obj.update(File.read(path))
+        end
+    end
+
     def OpenNebulaHelper.editor_input(contents=nil)
         require 'tempfile'