opennebula-cli 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4017d877673760df00dd6e69de62d11219d7cff
-  data.tar.gz: aa1b5def2ce6dd9f38fae26ecefc3f5f1d352a70
+  metadata.gz: 7898ac99cecd152ea743a52a93477038ee82ba80
+  data.tar.gz: 51743bf968d7d071faf589feaf5ebab16fef8b39
 SHA512:
-  metadata.gz: 67f265fdb49077e5b92f9b973eded9a4def990490884b67fe99a61f7d48690703d8fdb9ff4c3ae3ad415f1b07ebba57622efb2b6238759d5bfddadbba90d34f4
-  data.tar.gz: 30aa09b27074ee9800bb54c8d2f1f544e83ed4557ca0a9d11ffbcc980fb130ed8ab63556db4beeebf6f7d60c46ddaa47c02978ec2e5640e6f36f444e9fa39bf7
+  metadata.gz: 7c7d8725c0fd499f613584bd1b04985049196a6d132bde5257c861f3e3166808849f9be4de8323a5be7f094756373b307691ed1159a787708679070026b442da
+  data.tar.gz: 747442104db1ef7dfbfd0c8adf19f9a9deab687fec3f9fe5c09f16f24dbad18a563c74b3199e5f0c7127dbd0025f72bb82e07b05ada3fb3b90d7754a183662b6

data/bin/onevcenter

@@ -51,7 +51,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :short => "-o object",
         :large => "--object object ",
         :format => String,
-        :description => "vCenter object"
+        :description => "vCenter object: [datastores, templates, networks, datastores, images]"
     }
 
     HOST = {
@@ -128,8 +128,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     ############################################################################
     list_desc = <<-EOT.unindent
         Show a list with unimported vCenter objects
-    EOT
 
+        Examples:
+           - listing available templates:
+
+             onevcenter list -o templates -h <host_id>
+
+           - listing available images:
+
+             onevcenter list -o datastores -h <host_id> -d <ds-img_id>
+    EOT
     command :list, list_desc, :options=>[ OBJECT, HOST, DATASTORE, VCENTER, USER, PASS ] do
         begin
             args = helper.parse_opts(options)
@@ -148,6 +156,19 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     import_desc = <<-EOT.unindent
         Import the the desired vCenter object
+
+        Examples:
+           - importing first datastore
+
+             onevcenter list -o templates -h <host_id>
+
+           - importing 2 concrete templates:
+
+             onevcenter import "vm-1252, vm-553, vm-1248" -o templates -h <host_id>
+
+           - importing a image range:
+
+             onevcenter import 0..10 -o images -h <host_id> -d <ds-img_id>
     EOT
 
     command :import, import_desc, [:oid, nil], :options=>[ OBJECT, HOST, DATASTORE ] do
@@ -194,6 +215,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     ############################################################################
     host_desc = <<-EOT.unindent
         Import vCenter clusters as OpenNebula hosts
+
+        Example:
+           - Get available clusters:
+
+             onevcenter hosts --vcenter <vcenter> --vuser <vcenter_user> --vpass <password>
     EOT
     command :hosts, host_desc, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
         con_ops = helper.connection_options("Hosts", options)

data/bin/onezone

@@ -36,6 +36,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneZoneHelper.new
 
+    ENDPOINT = {
+        :name => "keep",
+        :short  => "-k",
+        :large => "--keep",
+        :description => "Don't overwrite endpoint file located in home folder, use it as a temporary zone.",
+        :format => String
+    }
+
     before_proc do
         helper.set_client(options)
     end
@@ -191,7 +199,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Set shell session access point for the CLI to the given Zone
     EOT
 
-    command :set, set_desc,:zoneid do
-        helper.set_zone(args[0])
+    command :set, set_desc,:zoneid, :options=>ENDPOINT do
+        if options.has_key? :keep
+            helper.set_zone(args[0], true)
+        else
+            helper.set_zone(args[0], false)
+        end
     end
 end

data/lib/cli_helper.rb

@@ -132,16 +132,21 @@ module CLIHelper
     # Print header
     def CLIHelper.print_header(str, underline=true)
         if $stdout.tty?
-            scr_bold
-            scr_underline if underline
-            print str
-            scr_restore
+            print_tty_header(str, underline)
         else
             print str
         end
         puts
     end
 
+    # Pretty print header
+    def CLIHelper.print_tty_header(str, underline=true)
+        scr_bold
+        scr_underline if underline
+        print str
+        scr_restore
+    end
+
     module HashWithSearch
         def dsearch(path)
             stems=path.split('/')
@@ -256,10 +261,18 @@ module CLIHelper
             end
         end
 
+        def print_tty_header
+            CLIHelper.print_tty_header(header_str)
+            puts
+        end
+
         private
 
         def print_table(data, options)
-            CLIHelper.print_header(header_str) if !options[:csv]
+            if !options[:csv] && !options[:noheader]
+                CLIHelper.print_header(header_str) 
+            end
+
             data ? print_data(data, options) : puts
         end
 

data/lib/command_parser.rb

@@ -575,8 +575,11 @@ module CommandParser
                     }
 
                     unless argument
-                        puts error_msg if error_msg
-                        puts "command #{name}: argument #{id} must be one of #{format.join(', ')}"
+                        if error_msg
+                            puts error_msg
+                        else
+                            puts "command #{name}: argument #{id} must be one of #{format.join(', ')}"
+                        end
                         exit -1
                     end
 

data/lib/one_helper.rb

@@ -16,6 +16,9 @@
 
 require 'cli_helper'
 
+require 'open3'
+require 'io/console'
+
 begin
     require 'opennebula'
 rescue Exception => e
@@ -505,51 +508,255 @@ EOT
             end
         end
 
+        #-----------------------------------------------------------------------
+        #  List pool functions
+        #-----------------------------------------------------------------------
+        def start_pager
+            pager = ENV['ONE_PAGER'] || 'less'
 
-        def list_pool(options, top=false, filter_flag=nil)
-            if options[:describe]
-                table = format_pool(options)
+            # Start pager, defaults to less
+            p_r, p_w = IO.pipe
 
-                table.describe_columns
-                return 0
+            lpid = fork do
+                $stdin.reopen(p_r)
+
+                p_r.close
+                p_w.close
+
+                Kernel.select [$stdin]
+
+                exec([pager, pager])
             end
+            
+            # Send listing to pager pipe
+            $stdout.close
+            $stdout = p_w.dup
 
-            filter_flag ||= OpenNebula::Pool::INFO_ALL
+            p_w.close
+            p_r.close
+
+            return lpid
+        end
 
-            pool = factory_pool(filter_flag)
+        def stop_pager(lpid)
+            $stdout.close
+
+            begin
+                Process.wait(lpid)
+            rescue Errno::ECHILD
+            end
+        end
+
+        def print_page(pool, options)
+            page = nil
 
             if options[:xml]
-                # TODO: use paginated functions
-                rc=pool.info
-                return -1, rc.message if OpenNebula.is_error?(rc)
-                return 0, pool.to_xml(true)
+                elements = 0
+                page     = ""
+
+                pool.each {|e| 
+                    elements += 1 
+                    page << e.to_xml(true) << "\n"
+                }
             else
-                table = format_pool(options)
+            
+                pname = pool.pool_name
+                ename = pool.element_name
 
-                if top
-                    table.top(options) {
-                        array=pool.get_hash
-                        return -1, array.message if OpenNebula.is_error?(array)
+                page  = pool.to_hash
+                elems = page["#{pname}"]["#{ename}"]
 
-                        array
-                    }
+                if elems.class == Array
+                    elements = elems.length
                 else
-                    array=pool.get_hash
-                    return -1, array.message if OpenNebula.is_error?(array)
-
-                    rname=self.class.rname
-                    elements=array["#{rname}_POOL"][rname]
-                    if options[:ids] && elements
-                        elements.reject! do |element|
-                            !options[:ids].include?(element['ID'].to_i)
-                        end
+                    elements = 1
+                end
+            end
+
+            return elements, page
+        end
+
+        #-----------------------------------------------------------------------
+        # List the pool in table form, it uses pagination for interactive
+        # output
+        #-----------------------------------------------------------------------
+        def list_pool_table(table, pool, options, filter_flag)
+            if $stdout.isatty 
+                size = $stdout.winsize[0] - 1 
+
+                # ----------- First page, check if pager is needed -------------
+                rc = pool.get_page(size, 0)
+                ps = ""
+
+                return -1, rc.message if OpenNebula.is_error?(rc)
+
+                elements, hash = print_page(pool, options)
+
+                ppid = -1
+
+                if elements >= size
+                    ppid = start_pager
+                end
+
+                table.show(hash, options)
+
+                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
+
+                options[:noheader] = true
+
+                loop do
+                    rc = pool.get_page(size, current)
+
+                    return -1, rc.message if OpenNebula.is_error?(rc)
+
+                    current += size
+
+                    begin
+                        Process.waitpid(ppid, Process::WNOHANG)
+                    rescue Errno::ECHILD
+                        break
                     end
 
-                    table.show(array, options)
+                    elements, hash = print_page(pool, options)
+
+                    table.show(hash, options)
+
+                    $stdout.flush
+
+                    break if elements < size
+                end
+
+                stop_pager(ppid)
+            else
+                array = pool.get_hash
+                return -1, array.message if OpenNebula.is_error?(array)
+
+                rname    = self.class.rname
+                elements = array["#{rname}_POOL"][rname]
+
+               if options[:ids] && elements
+                    elements.reject! do |element|
+                        !options[:ids].include?(element['ID'].to_i)
+                    end
+                end
+
+                table.show(array, options)
+            end
+
+            return 0
+        end
+
+        #-----------------------------------------------------------------------
+        # List pool in XML format, pagination is used in interactive output
+        #-----------------------------------------------------------------------
+        def list_pool_xml(pool, options, filter_flag)
+            if $stdout.isatty 
+                size = $stdout.winsize[0] - 1 
+
+                # ----------- First page, check if pager is needed -------------
+                rc = pool.get_page(size, 0)
+                ps = ""
+
+                return -1, rc.message if OpenNebula.is_error?(rc)
+
+                pname = pool.pool_name
+
+                elements, page = print_page(pool, options)
+
+                ppid = -1
+
+                if elements >= size
+                    ppid = start_pager
+                end
+
+                puts "<#{pname}>"
+
+                puts page
+
+                if elements < size
+                    puts "</#{pname}>"
+                    return 0
                 end
 
+                # ------- Rest of the pages in the pool, piped to pager --------
+                current = size
+
+                loop do
+                    rc = pool.get_page(size, current)
+
+                    return -1, rc.message if OpenNebula.is_error?(rc)
+
+                    current += size
+
+                    elements, page = print_page(pool, options)
+
+                    puts page
+
+                    $stdout.flush
+
+                    break if elements < size
+                end
+
+                puts "</#{pname}>"
+
+                stop_pager(ppid)
+            else
+                rc = pool.info
+
+                return -1, rc.message if OpenNebula.is_error?(rc)
+
+                puts pool.to_xml(true)
+            end
+
+            return 0
+        end
+
+        #-----------------------------------------------------------------------
+        # List pool table in top-like form
+        #-----------------------------------------------------------------------
+        def list_pool_top(table, pool, options)
+            table.top(options) {
+                array = pool.get_hash
+
+                return -1, array.message if OpenNebula.is_error?(array)
+
+                array
+            }
+
+            return 0
+        end
+
+
+        def list_pool(options, top=false, filter_flag=nil)
+            table = format_pool(options)
+
+            if options[:describe]
+                table.describe_columns
+
                 return 0
             end
+
+            filter_flag ||= OpenNebula::Pool::INFO_ALL
+
+            pool  = factory_pool(filter_flag)
+
+            if top
+                return list_pool_top(table, pool, options)
+            elsif options[:xml]
+                return list_pool_xml(pool, options, filter_flag)
+            else
+                return list_pool_table(table, pool, options, filter_flag)
+            end
+
+            return 0
         end
 
         def show_resource(id, options)
@@ -834,8 +1041,11 @@ EOT
         end
     end
 
-    def OpenNebulaHelper.time_to_str(time, print_seconds=true, print_hours=true, print_years=false)
-        value=time.to_i
+    def OpenNebulaHelper.time_to_str(time, print_seconds=true, 
+        print_hours=true, print_years=false)
+
+        value = time.to_i
+
         if value==0
             value='-'
         else

data/lib/one_helper/onegroup_helper.rb

@@ -111,12 +111,18 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
                         q['VM_QUOTA']['VM'] = {
-                            "VMS"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"    => "0",
-                            "CPU"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"    => "0",
-                            "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED" => "0",
+                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "VMS_USED"              => "0",
+                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "CPU_USED"              => "0",
+                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
+                            "MEMORY_USED"           => "0",
+                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_VMS_USED"      => "0",
+                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_CPU_USED"      => "0",
+                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_MEMORY_USED"   => "0",
                             "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "SYSTEM_DISK_SIZE_USED" => "0"
                         }
@@ -148,12 +154,18 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
                         q['VM_QUOTA']['VM'] = {
-                            "VMS"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"    => "0",
-                            "CPU"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"    => "0",
-                            "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED" => "0",
+                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "VMS_USED"              => "0",
+                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "CPU_USED"              => "0",
+                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
+                            "MEMORY_USED"           => "0",
+                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_VMS_USED"      => "0",
+                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_CPU_USED"      => "0",
+                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_MEMORY_USED"   => "0",
                             "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "SYSTEM_DISK_SIZE_USED" => "0"
                         }
@@ -188,12 +200,18 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
                         q['VM_QUOTA']['VM'] = {
-                            "VMS"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"    => "0",
-                            "CPU"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"    => "0",
-                            "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED" => "0",
+                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "VMS_USED"              => "0",
+                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "CPU_USED"              => "0",
+                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
+                            "MEMORY_USED"           => "0",
+                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_VMS_USED"      => "0",
+                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_CPU_USED"      => "0",
+                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_MEMORY_USED"   => "0",
                             "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "SYSTEM_DISK_SIZE_USED" => "0"
                         }

data/lib/one_helper/onehost_helper.rb

@@ -296,6 +296,9 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             # Skip this host from remote syncing if it's OFFLINE
             next if Host::HOST_STATES[state.to_i] == 'OFFLINE'
 
+            # Skip this host if it is a vCenter cluster
+            next if vm_mad == "vcenter"
+
             host_version=host['TEMPLATE/VERSION']
 
             begin

data/lib/one_helper/onequota_helper.rb

@@ -35,8 +35,11 @@ class OneQuotaHelper
         #
         #  VM = [
         #    VMS              = <Max. number of VMs>
+        #    RUNNING_VMS      = <Max. number of running VMs>
         #    MEMORY           = <Max. allocated memory (MB)>
+        #    RUNNING_MEMORY   = <Max. running memory (MB)>
         #    CPU              = <Max. allocated CPU>
+        #    RUNNING_CPU      = <Max. running CPU>
         #    SYSTEM_DISK_SIZE = <Max. allocated system disk (MB)>
         #  ]
         #
@@ -196,7 +199,7 @@ class OneQuotaHelper
 
         puts
 
-        CLIHelper.print_header(str_h1 % "RESOURCE USAGE & QUOTAS",false)
+        CLIHelper.print_header(str_h1 % "VMS USAGE & QUOTAS",false)
 
         puts
 
@@ -210,12 +213,18 @@ class OneQuotaHelper
             limit = LIMIT_DEFAULT
 
             vm_quotas = [{
-                "VMS"         => limit,
-                "VMS_USED"    => "0",
-                "CPU"         => limit,
-                "CPU_USED"    => "0",
-                "MEMORY"      => limit,
-                "MEMORY_USED" => "0",
+                "VMS"                   => limit,
+                "VMS_USED"              => "0",
+                "CPU"                   => limit,
+                "CPU_USED"              => "0",
+                "MEMORY"                => limit,
+                "MEMORY_USED"           => "0",
+                "RUNNING_VMS"           => limit,
+                "RUNNING_VMS_USED"      => "0",
+                "RUNNING_CPU"           => limit,
+                "RUNNING_CPU_USED"      => "0",
+                "RUNNING_MEMORY"        => limit,
+                "RUNNING_MEMORY_USED"   => "0",
                 "SYSTEM_DISK_SIZE"      => limit,
                 "SYSTEM_DISK_SIZE_USED" => "0"
             }]
@@ -223,7 +232,7 @@ class OneQuotaHelper
 
         if !vm_quotas[0].nil?
             CLIHelper::ShowTable.new(nil, self) do
-                column :"NUMBER OF VMS", "", :right, :size=>17 do |d|
+                column :"VMS", "", :right, :size=>17 do |d|
                     if !d.nil?
                         elem = 'VMS'
                         limit = d[elem]
@@ -297,11 +306,87 @@ class OneQuotaHelper
             puts
         end
 
+        CLIHelper.print_header(str_h1 % "VMS USAGE & QUOTAS - RUNNING",false)
+
+        puts
+
+        if !vm_quotas[0].nil?
+            CLIHelper::ShowTable.new(nil, self) do
+                column :"RUNNING VMS", "", :right, :size=>17 do |d|
+                    if !d.nil?
+                        elem = 'RUNNING_VMS'
+                        limit = d[elem] || LIMIT_UNLIMITED
+                        limit = helper.get_default_limit(
+                            limit, "VM_QUOTA/VM/#{elem}")
+
+                        if d["RUNNING_VMS_USED"].nil?
+                            d["RUNNING_VMS_USED"] = 0
+                        end
+
+                        if limit == LIMIT_UNLIMITED
+                            "%7d /       -" % [d["RUNNING_VMS_USED"]]
+                        else
+                            "%7d / %7d" % [d["RUNNING_VMS_USED"], limit]
+                        end
+                    end
+                end
+
+                column :"RUNNING MEMORY", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'RUNNING_MEMORY'
+                        limit = d[elem] || LIMIT_UNLIMITED
+                        limit = helper.get_default_limit(
+                            limit, "VM_QUOTA/VM/#{elem}")
+
+                        if d["RUNNING_MEMORY_USED"].nil?
+                            d["RUNNING_MEMORY_USED"] = 0
+                        end
+
+                        if limit == LIMIT_UNLIMITED
+                            "%8s /        -" % [
+                                OpenNebulaHelper.unit_to_str(d["RUNNING_MEMORY_USED"].to_i,{},"M")
+                            ]
+                        else
+                            "%8s / %8s" % [
+                                OpenNebulaHelper.unit_to_str(d["RUNNING_MEMORY_USED"].to_i,{},"M"),
+                                OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
+                            ]
+                        end
+                    end
+                end
+
+                column :"RUNNING CPU", "", :right, :size=>20 do |d|
+                    if !d.nil?
+                        elem = 'RUNNING_CPU'
+                        limit = d[elem] || LIMIT_UNLIMITED
+                        limit = helper.get_default_limit(
+                            limit, "VM_QUOTA/VM/#{elem}")
+
+                        if d["RUNNING_CPU_USED"].nil?
+                            d["RUNNING_CPU_USED"] = 0
+                        end
+
+                        if limit == LIMIT_UNLIMITED
+                            "%8.2f /        -" % [d["RUNNING_CPU_USED"]]
+                        else
+                            "%8.2f / %8.2f" % [d["RUNNING_CPU_USED"], limit]
+                        end
+                    end
+                end
+            end.show(vm_quotas, {})
+
+            puts
+        end
+
+        CLIHelper.print_header(str_h1 % "DATASTORE USAGE & QUOTAS",false)
+
+        puts
+
         ds_quotas = [qh['DATASTORE_QUOTA']['DATASTORE']].flatten
 
         if !ds_quotas[0].nil?
             CLIHelper::ShowTable.new(nil, self) do
-                column :"DATASTORE ID", "", :size=>12 do |d|
+                column :"ID", "", :size=>12 do |d|
                     d["ID"] if !d.nil?
                 end
 
@@ -344,11 +429,15 @@ class OneQuotaHelper
             puts
         end
 
+        CLIHelper.print_header(str_h1 % "NETWORK USAGE & QUOTAS",false)
+
+        puts
+
         net_quotas = [qh['NETWORK_QUOTA']['NETWORK']].flatten
 
         if !net_quotas[0].nil?
             CLIHelper::ShowTable.new(nil, self) do
-                column :"NETWORK ID", "", :size=>12 do |d|
+                column :"ID", "", :size=>12 do |d|
                     d["ID"] if !d.nil?
                 end
 
@@ -371,11 +460,15 @@ class OneQuotaHelper
             puts
         end
 
+        CLIHelper.print_header(str_h1 % "IMAGE USAGE & QUOTAS",false)
+
+        puts
+
         image_quotas = [qh['IMAGE_QUOTA']['IMAGE']].flatten
 
         if !image_quotas[0].nil?
             CLIHelper::ShowTable.new(nil, self) do
-                column :"IMAGE ID", "", :size=>12 do |d|
+                column :"ID", "", :size=>12 do |d|
                     d["ID"] if !d.nil?
                 end
 

data/lib/one_helper/oneuser_helper.rb

@@ -294,12 +294,18 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
                         q['VM_QUOTA']['VM'] = {
-                            "VMS"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"    => "0",
-                            "CPU"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"    => "0",
-                            "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED" => "0",
+                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "VMS_USED"              => "0",
+                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "CPU_USED"              => "0",
+                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
+                            "MEMORY_USED"           => "0",
+                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_VMS_USED"      => "0",
+                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_CPU_USED"      => "0",
+                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_MEMORY_USED"   => "0",
                             "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "SYSTEM_DISK_SIZE_USED" => "0"
                         }
@@ -333,12 +339,18 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
                         q['VM_QUOTA']['VM'] = {
-                            "VMS"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"    => "0",
-                            "CPU"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"    => "0",
-                            "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED" => "0",
+                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "VMS_USED"              => "0",
+                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "CPU_USED"              => "0",
+                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
+                            "MEMORY_USED"           => "0",
+                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_VMS_USED"      => "0",
+                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_CPU_USED"      => "0",
+                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_MEMORY_USED"   => "0",
                             "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "SYSTEM_DISK_SIZE_USED" => "0"
                         }
@@ -375,12 +387,18 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
                     if q['VM_QUOTA']['VM'].nil? && d["ID"].to_i != 0
                         q['VM_QUOTA']['VM'] = {
-                            "VMS"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VMS_USED"    => "0",
-                            "CPU"         => OneQuotaHelper::LIMIT_DEFAULT,
-                            "CPU_USED"    => "0",
-                            "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "MEMORY_USED" => "0",
+                            "VMS"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "VMS_USED"              => "0",
+                            "CPU"                   => OneQuotaHelper::LIMIT_DEFAULT,
+                            "CPU_USED"              => "0",
+                            "MEMORY"                => OneQuotaHelper::LIMIT_DEFAULT,
+                            "MEMORY_USED"           => "0",
+                            "RUNNING_VMS"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_VMS_USED"      => "0",
+                            "RUNNING_CPU"           => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_CPU_USED"      => "0",
+                            "RUNNING_MEMORY"        => OneQuotaHelper::LIMIT_DEFAULT,
+                            "RUNNING_MEMORY_USED"   => "0",
                             "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "SYSTEM_DISK_SIZE_USED" => "0"
                         }

data/lib/one_helper/onevcenter_helper.rb

@@ -120,6 +120,8 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
 	# @param type [String] String representing the vCenter resource
     #
     def set_object(type)
+        raise "you need to use -o option!" unless type
+
         type = type.downcase
         if (type == "datastores")
             @vobject = VOBJECT::DATASTORE

data/lib/one_helper/onezone_helper.rb

@@ -83,25 +83,28 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         table
     end
 
-    def set_zone(zone_id)
-      zone = factory(zone_id)
-      rc = zone.info
+    def set_zone(zone_id, temporary_zone)
+        zone = factory(zone_id)
+        rc = zone.info
 
-      if OpenNebula.is_error?(rc)
-        return -1, rc.message
-      end
-
-      if !zone['TEMPLATE/ENDPOINT']
-        return -1, "No Endpoint defined for Zone #{zone_id}"
-      end
+        if OpenNebula.is_error?(rc)
+            return -1, rc.message
+        end
 
-      File.open(ENV['HOME']+"/.one/one_endpoint", 'w'){|f|
-         f.puts zone['TEMPLATE/ENDPOINT']
-      }
+        if !zone['TEMPLATE/ENDPOINT']
+            return -1, "No Endpoint defined for Zone #{zone_id}"
+        end
 
-      puts "Endpoint changed to \"#{zone['TEMPLATE/ENDPOINT']}\" in " <<
-           "#{ENV['HOME']}/.one/one_endpoint"
-      return 0
+        if temporary_zone
+            puts "Type: export ONE_XMLRPC=#{zone['TEMPLATE/ENDPOINT']}"
+        else
+            File.open(ENV['HOME']+"/.one/one_endpoint", 'w'){|f|
+                f.puts zone['TEMPLATE/ENDPOINT']
+            }
+            puts "Endpoint changed to \"#{zone['TEMPLATE/ENDPOINT']}\" in " <<
+                "#{ENV['HOME']}/.one/one_endpoint"
+        end
+        return 0
     end
 
     private

metadata

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