opennebula-cli 4.6.1 → 4.7.80.beta

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 585883a7bcb4f9ac918ccb674a77e40dc14b7883
+  data.tar.gz: ab8c5c867a236d9a78aa65ff4679a85077cf93eb
+SHA512:
+  metadata.gz: 504217b07bc07ee8802598b4090b903f63866ffef10bd24dd76d599bacaab7b292bcad92799dfee336fa5b22b582d6b346ca784b9edb7f6e3e4fac076f8e33ca
+  data.tar.gz: 6de0113350a2d42d773f8b14d009dec444eff62e62820d9ab08e2ecbbc943252656cc251c88855853214c4d7502a807dec3493dda6b6e68aa78d4f966a7a2a3b

data/bin/oneflow-template

@@ -165,7 +165,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         OpenNebulaHelper.rname_to_id(arg, "USER")
     end
 
-    set :format, :template_id, Service.rname_to_id_desc("SERVICE TEMPLATE") do |arg|
+    set :format, :templateid, Service.rname_to_id_desc("SERVICE TEMPLATE") do |arg|
         Service.rname_to_id(arg, "SERVICE TEMPLATE")
     end
 
@@ -266,7 +266,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Show detailed information of a given Service Template
     EOT
 
-    command :show, show_desc, :template_id, :options => Service::JSON_FORMAT do
+    command :show, show_desc, :templateid, :options => Service::JSON_FORMAT do
         client = Service::Client.new(
                     :username   => options[:username],
                     :password   => options[:password],
@@ -304,7 +304,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Instantiate a Service Template
     EOT
 
-    command :instantiate, instantiate_desc, :template_id,
+    command :instantiate, instantiate_desc, :templateid, [:file, nil],
             :options => [Service::JSON_FORMAT, Service::TOP] do
         client = Service::Client.new(
                     :username   => options[:username],
@@ -312,7 +312,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     :url        => options[:server],
                     :user_agent => USER_AGENT)
 
-        json_str = Service.build_json_action('instantiate')
+        params = Hash.new
+
+        if(args[1])
+            params['merge_template'] = JSON.parse(File.read(args[1]))
+        end
+
+        json_str = Service.build_json_action('instantiate', params)
 
         response = client.post("#{RESOURCE_PATH}/#{args[0]}/action", json_str)
 
@@ -448,4 +454,4 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         exit_code
     end
-end
+end

data/bin/oneimage

@@ -161,9 +161,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Creates a new Image from an existing one
     EOT
 
-    command :clone, clone_desc, :imageid, :name do
+    command :clone, clone_desc, :imageid, :name,
+        :options=>[OneDatastoreHelper::DATASTORE] do
         helper.perform_action(args[0],options,"cloned") do |image|
-            res = image.clone(args[1])
+            ds_id = options[:datastore] || -1 # -1 clones to self
+            res   = image.clone(args[1], ds_id)
 
             if !OpenNebula.is_error?(res)
                 puts "ID: #{res}"

data/bin/onevnet

@@ -47,6 +47,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     CREATE_OPTIONS = [OneClusterHelper::CLUSTER]
+    STD_OPTIONS = CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
     ########################################################################
     # Formatters for arguments
@@ -71,6 +72,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.filterflag_to_i(arg)
     end
 
+    set :format, :ar_id, "Integer" do |arg|
+        format_int(arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################
@@ -103,23 +108,65 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    addleases_desc = <<-EOT.unindent
-        Adds a lease to the Virtual Network
+    addar_desc = <<-EOT.unindent
+        Adds an address range to the Virtual Network
     EOT
 
-    command :addleases, addleases_desc, :vnetid, :ip, [:mac, nil] do
+    command :addar, addar_desc, :vnetid, :options=>STD_OPTIONS + [OneVNetHelper::AR_SIZE,
+        OneVNetHelper::AR_MAC, OneVNetHelper::AR_IP, OneVNetHelper::AR_IP6_GLOBAL,
+        OneVNetHelper::AR_IP6_ULA ] do
         helper.perform_action(args[0],options,"lease added") do |vn|
-            vn.addleases(args[1], args[2])
+            ar = "AR = [ "
+
+            if options[:ip]
+                if options[:ip6_global] || options[:ip6_ula]
+                    ar << "TYPE=\"IP4_6\""
+                else
+                    ar << "TYPE=\"IP4\""
+                end
+            else
+                if options[:ip6_global] || options[:ip6_ula]
+                    ar << "TYPE=\"IP6\""
+                else
+                    ar << "TYPE=\"ETHER\""
+                end
+            end
+
+            if options[:size]
+                ar << ", SIZE = " << options[:size]
+            else
+                STDERR.puts "Address range needs to specify size (-s size)"
+                exit -1
+            end
+
+            ar << ", IP = " << options[:ip] if options[:ip]
+            ar << ", MAC = " << options[:mac] if options[:mac]
+            ar << ", GLOBAL_PREFIX = " << options[:ip6_global] if options[:ip6_global]
+            ar << ", ULA_PREFIX = " << options[:ip6_ula] if options[:ip6_ula]
+
+            ar << "]"
+
+            vn.add_ar(ar)
+        end
+    end
+
+    rmar_desc = <<-EOT.unindent
+        Removes an address range from the Virtual Network
+    EOT
+
+    command :rmar, rmar_desc, :vnetid, :ar_id do
+        helper.perform_action(args[0],options,"address range removed") do |vn|
+            vn.rm_ar(args[1])
         end
     end
 
-    rmleases_desc = <<-EOT.unindent
-        Removes a lease from the Virtual Network
+    free_desc = <<-EOT.unindent
+        Frees a reserved address range from the Virtual Network
     EOT
 
-    command :rmleases, rmleases_desc, :vnetid, :ip do
-        helper.perform_action(args[0],options,"lease removed") do |vn|
-            vn.rmleases(args[1])
+    command :free, free_desc, :vnetid, :ar_id do
+        helper.perform_action(args[0],options,"address range freed") do |vn|
+            vn.free(args[1])
         end
     end
 
@@ -127,9 +174,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Holds a Virtual Network lease, marking it as used
     EOT
 
-    command :hold, hold_desc, :vnetid, :ip do
+    command :hold, hold_desc, :vnetid, :ip,
+        :options=>STD_OPTIONS + [OneVNetHelper::AR] do
         helper.perform_action(args[0],options,"lease on hold") do |vn|
-            vn.hold(args[1])
+            ar  = options[:ar_id] || -1
+
+            vn.hold(args[1], ar)
         end
     end
 
@@ -137,12 +187,48 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Releases a Virtual Network lease on hold
     EOT
 
-    command :release, release_desc, :vnetid, :ip do
+    command :release, release_desc, :vnetid, :ip,
+        :options=>STD_OPTIONS + [OneVNetHelper::AR] do
         helper.perform_action(args[0],options,"lease released") do |vn|
-            vn.release(args[1])
+            ar  = options[:ar_id] || -1
+
+            vn.release(args[1], ar)
         end
     end
 
+    reserve_desc = <<-EOT.unindent
+        Reserve addresses from the Virtual Network. A new virtual network will
+        be created to hold the reservation. Optionally the reservation can be
+        put on an exisiting VNET, as long as it contains a valid reservation
+        from the same VNET
+    EOT
+
+    command :reserve, reserve_desc, :vnetid, [:vnetid, nil],
+        :options=>STD_OPTIONS + [OneVNetHelper::AR, OneVNetHelper::R_NAME,
+            OneVNetHelper::R_SIZE, OneVNetHelper::AR_MAC, OneVNetHelper::AR_IP] do
+        helper.perform_action(args[0],options,"reservation made") do |vn|
+            rsize = options[:rsize] || -1
+            rname = options[:rname] || -1
+
+            addr = nil
+            addr = options[:mac] if options[:mac]
+            addr = options[:ip] if options[:ip]
+
+            if rsize == -1
+                STDERR.puts "Specify a size (-s size) for the reservation"
+                exit -1
+            end
+
+            if rname == -1 && args[1].nil?
+                STDERR.puts "Specify a name (-n name) for the reservation"
+                exit -1
+            end
+
+            vn.reserve(rname, rsize, options[:ar_id], addr, args[1])
+        end
+    end
+
+
     chgrp_desc = <<-EOT.unindent
         Changes the Virtual Network group
     EOT
@@ -212,6 +298,36 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    update_ar_desc = <<-EOT.unindent
+        Update Address Range variables. SIZE, IP, MAC and TYPE cannot be updated
+    EOT
+
+    command :updatear, update_ar_desc, :vnetid, :ar_id, [:file, nil] do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            rc = obj.info
+
+            if OpenNebula.is_error?(rc)
+                puts rc.message
+                exit -1
+            end
+
+            obj.delete_element("AR_POOL/AR[AR_ID!=#{args[1]}]")
+            obj.delete_element("AR_POOL/AR/LEASES")
+            obj.delete_element("AR_POOL/AR/USED_LEASES")
+
+            if obj.template_like_str("AR_POOL").empty?
+                puts "Address Range #{args[1]} does not exit for "<<
+                    "Virtual Network #{args[0]}"
+                exit -1
+            end
+
+            str = OpenNebulaHelper.update_template_helper(false, args[0], obj,
+                args[2], "AR_POOL", false)
+
+            obj.update_ar(str)
+        end
+    end
+
     rename_desc = <<-EOT.unindent
         Renames the Virtual Network
     EOT

data/lib/cli_helper.rb

@@ -368,7 +368,7 @@ module CLIHelper
                         exit(-1)
                     end
                 else
-                    STDERR.puts "Expresion '#{s}' incorrect"
+                    STDERR.puts "Expression '#{s}' incorrect"
                     exit(-1)
                 end
             end

data/lib/one_helper.rb

@@ -821,7 +821,7 @@ EOT
         return update_template_helper(true, id, resource, path, xpath)
     end
 
-    def OpenNebulaHelper.update_template_helper(append, id, resource, path, xpath)
+    def OpenNebulaHelper.update_template_helper(append, id, resource, path, xpath, update=true)
         unless path
             require 'tempfile'
 
@@ -829,11 +829,13 @@ EOT
             path = tmp.path
 
             if !append
-                rc = resource.info
+                if update
+                    rc = resource.info
 
-                if OpenNebula.is_error?(rc)
-                    puts rc.message
-                    exit -1
+                    if OpenNebula.is_error?(rc)
+                        puts rc.message
+                        exit -1
+                    end
                 end
 
                 tmp << resource.template_like_str(xpath)

data/lib/one_helper/onegroup_helper.rb

@@ -110,12 +110,16 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
                     limit = q['VM_QUOTA']['VM']["VMS"]
 
-                    if limit == "-1"
+                    if limit == OneQuotaHelper::LIMIT_DEFAULT
                         limit = pool_default_quotas("VM_QUOTA/VM/VMS")
-                        limit = "0" if limit.nil? || limit == ""
+                        limit = OneQuotaHelper::LIMIT_UNLIMITED if limit.nil? || limit == ""
                     end
 
-                    "%3d / %3d" % [q['VM_QUOTA']['VM']["VMS_USED"], limit]
+                    if limit == OneQuotaHelper::LIMIT_UNLIMITED
+                        "%3d /   -" % [q['VM_QUOTA']['VM']["VMS_USED"]]
+                    else
+                        "%3d / %3d" % [q['VM_QUOTA']['VM']["VMS_USED"], limit]
+                    end
 
                 rescue NoMethodError
                     "-"
@@ -127,13 +131,19 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
                     limit = q['VM_QUOTA']['VM']["MEMORY"]
 
-                    if limit == "-1"
+                    if limit == OneQuotaHelper::LIMIT_DEFAULT
                         limit = pool_default_quotas("VM_QUOTA/VM/MEMORY")
-                        limit = "0" if limit.nil? || limit == ""
+                        limit = OneQuotaHelper::LIMIT_UNLIMITED if limit.nil? || limit == ""
                     end
 
-                    "%7s / %7s" % [OpenNebulaHelper.unit_to_str(q['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M"),
-                    OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")]
+                    if limit == OneQuotaHelper::LIMIT_UNLIMITED
+                        "%7s /       -" % [
+                            OpenNebulaHelper.unit_to_str(q['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M")]
+                    else
+                        "%7s / %7s" % [
+                            OpenNebulaHelper.unit_to_str(q['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M"),
+                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")]
+                    end
 
                 rescue NoMethodError
                     "-"
@@ -145,12 +155,16 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
                     limit = q['VM_QUOTA']['VM']["CPU"]
 
-                    if limit == "-1"
+                    if limit == OneQuotaHelper::LIMIT_DEFAULT
                         limit = pool_default_quotas("VM_QUOTA/VM/CPU")
-                        limit = "0" if limit.nil? || limit == ""
+                        limit = OneQuotaHelper::LIMIT_UNLIMITED if limit.nil? || limit == ""
                     end
 
-                    "%3.1f / %3.1f" % [q['VM_QUOTA']['VM']["CPU_USED"], limit]
+                    if limit == OneQuotaHelper::LIMIT_UNLIMITED
+                        "%3.1f /    -" % [q['VM_QUOTA']['VM']["CPU_USED"]]
+                    else
+                        "%3.1f / %3.1f" % [q['VM_QUOTA']['VM']["CPU_USED"], limit]
+                    end
 
                 rescue NoMethodError
                     "-"

data/lib/one_helper/onequota_helper.rb

@@ -18,6 +18,9 @@ require 'cli_helper'
 
 class OneQuotaHelper
 
+    LIMIT_DEFAULT   = "-1"
+    LIMIT_UNLIMITED = "-2"
+
     EDITOR_PATH='/usr/bin/vi'
 
     HELP_QUOTA = <<-EOT.unindent
@@ -52,7 +55,7 @@ class OneQuotaHelper
         #
         #  In any quota:
         #    -1 means use the default limit (set with the 'defaultquota' command)
-        #    0 means unlimited.
+        #    -2 means unlimited.
         #
         #  The usage counters "*_USED" are shown for information
         #  purposes and will NOT be modified.
@@ -62,7 +65,7 @@ class OneQuotaHelper
     HELP_DEFAULT_QUOTA_FOOTER = <<-EOT.unindent
         #
         #  In any quota:
-        #    0 means unlimited.
+        #    -2 means unlimited.
         #
         #  The usage counters "*_USED" will always be 0 for the default
         #  quotas, and can be ignored.
@@ -209,7 +212,11 @@ class OneQuotaHelper
                         limit = helper.get_default_limit(
                             limit, "VM_QUOTA/VM/#{elem}")
 
-                        "%7d / %7d" % [d["VMS_USED"], limit]
+                        if limit == LIMIT_UNLIMITED
+                            "%7d /       -" % [d["VMS_USED"]]
+                        else
+                            "%7d / %7d" % [d["VMS_USED"], limit]
+                        end
                     end
                 end
 
@@ -220,10 +227,16 @@ class OneQuotaHelper
                         limit = helper.get_default_limit(
                             limit, "VM_QUOTA/VM/#{elem}")
 
-                        "%8s / %8s" % [
-                            OpenNebulaHelper.unit_to_str(d["MEMORY_USED"].to_i,{},"M"),
-                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
-                        ]
+                        if limit == LIMIT_UNLIMITED
+                            "%8s /        -" % [
+                                OpenNebulaHelper.unit_to_str(d["MEMORY_USED"].to_i,{},"M")
+                            ]
+                        else
+                            "%8s / %8s" % [
+                                OpenNebulaHelper.unit_to_str(d["MEMORY_USED"].to_i,{},"M"),
+                                OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
+                            ]
+                        end
                     end
                 end
 
@@ -234,7 +247,11 @@ class OneQuotaHelper
                         limit = helper.get_default_limit(
                             limit, "VM_QUOTA/VM/#{elem}")
 
-                        "%8.2f / %8.2f" % [d["CPU_USED"], limit]
+                        if limit == LIMIT_UNLIMITED
+                            "%8.2f /        -" % [d["CPU_USED"]]
+                        else
+                            "%8.2f / %8.2f" % [d["CPU_USED"], limit]
+                        end
                     end
                 end
 
@@ -245,10 +262,16 @@ class OneQuotaHelper
                         limit = helper.get_default_limit(
                             limit, "VM_QUOTA/VM/#{elem}")
 
-                        "%8s / %8s" % [
-                            OpenNebulaHelper.unit_to_str(d["VOLATILE_SIZE_USED"].to_i,{},"M"),
-                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
-                        ]
+                        if limit == LIMIT_UNLIMITED
+                            "%8s /        -" % [
+                                OpenNebulaHelper.unit_to_str(d["VOLATILE_SIZE_USED"].to_i,{},"M")
+                            ]
+                        else
+                            "%8s / %8s" % [
+                                OpenNebulaHelper.unit_to_str(d["VOLATILE_SIZE_USED"].to_i,{},"M"),
+                                OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
+                            ]
+                        end
                     end
                 end
             end.show(vm_quotas, {})
@@ -271,7 +294,11 @@ class OneQuotaHelper
                         limit = helper.get_default_limit(
                             limit, "DATASTORE_QUOTA/DATASTORE[ID=#{d['ID']}]/#{elem}")
 
-                        "%8d / %8d" % [d["IMAGES_USED"], limit]
+                        if limit == LIMIT_UNLIMITED
+                            "%8d /        -" % [d["IMAGES_USED"]]
+                        else
+                            "%8d / %8d" % [d["IMAGES_USED"], limit]
+                        end
                     end
                 end
 
@@ -282,10 +309,16 @@ class OneQuotaHelper
                         limit = helper.get_default_limit(
                             limit, "DATASTORE_QUOTA/DATASTORE[ID=#{d['ID']}]/#{elem}")
 
-                        "%8s / %8s" % [
-                            OpenNebulaHelper.unit_to_str(d["SIZE_USED"].to_i,{},"M"),
-                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
-                        ]
+                        if limit == LIMIT_UNLIMITED
+                            "%8s /        -" % [
+                                OpenNebulaHelper.unit_to_str(d["SIZE_USED"].to_i,{},"M")
+                            ]
+                        else
+                            "%8s / %8s" % [
+                                OpenNebulaHelper.unit_to_str(d["SIZE_USED"].to_i,{},"M"),
+                                OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
+                            ]
+                        end
                     end
                 end
             end.show(ds_quotas, {})
@@ -308,7 +341,11 @@ class OneQuotaHelper
                         limit = helper.get_default_limit(
                             limit, "NETWORK_QUOTA/NETWORK[ID=#{d['ID']}]/#{elem}")
 
-                        "%8d / %8d" % [d["LEASES_USED"], limit]
+                        if limit == LIMIT_UNLIMITED
+                            "%8d /        -" % [d["LEASES_USED"]]
+                        else
+                            "%8d / %8d" % [d["LEASES_USED"], limit]
+                        end
                     end
                 end
             end.show(net_quotas, {})
@@ -331,7 +368,11 @@ class OneQuotaHelper
                         limit = helper.get_default_limit(
                             limit, "IMAGE_QUOTA/IMAGE[ID=#{d['ID']}]/RVMS")
 
-                        "%8d / %8d" % [d["RVMS_USED"], limit]
+                        if limit == LIMIT_UNLIMITED
+                            "%8d /        -" % [d["RVMS_USED"]]
+                        else
+                            "%8d / %8d" % [d["RVMS_USED"], limit]
+                        end
                     end
                 end
             end.show(image_quotas, {})
@@ -339,13 +380,13 @@ class OneQuotaHelper
     end
 
     def get_default_limit(limit, xpath)
-        if limit == "-1"
+        if limit == LIMIT_DEFAULT
             if !@default_quotas.nil?
                 limit = @default_quotas[xpath]
 
-                limit = "0" if limit.nil? || limit == ""
+                limit = LIMIT_UNLIMITED if limit.nil? || limit == ""
             else
-                limit = "0"
+                limit = LIMIT_UNLIMITED
             end
         end
 

data/lib/one_helper/oneuser_helper.rb

@@ -190,12 +190,18 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
                     limit = q['VM_QUOTA']['VM']["VMS"]
 
-                    if limit == "-1"
+                    if limit == OneQuotaHelper::LIMIT_DEFAULT
                         limit = pool_default_quotas("VM_QUOTA/VM/VMS")
-                        limit = "0" if limit.nil? || limit == ""
+                        if limit.nil? || limit == ""
+                            limit = OneQuotaHelper::LIMIT_UNLIMITED
+                        end
                     end
 
-                    "%3d / %3d" % [q['VM_QUOTA']['VM']["VMS_USED"], limit]
+                    if limit == OneQuotaHelper::LIMIT_UNLIMITED
+                        "%3d /   -" % [q['VM_QUOTA']['VM']["VMS_USED"]]
+                    else
+                        "%3d / %3d" % [q['VM_QUOTA']['VM']["VMS_USED"], limit]
+                    end
 
                 rescue NoMethodError
                     "-"
@@ -207,13 +213,21 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
                     limit = q['VM_QUOTA']['VM']["MEMORY"]
 
-                    if limit == "-1"
+                    if limit == OneQuotaHelper::LIMIT_DEFAULT
                         limit = pool_default_quotas("VM_QUOTA/VM/MEMORY")
-                        limit = "0" if limit.nil? || limit == ""
+                        if limit.nil? || limit == ""
+                            limit = OneQuotaHelper::LIMIT_UNLIMITED
+                        end
                     end
 
-                    "%7s / %7s" % [OpenNebulaHelper.unit_to_str(q['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M"),
-                    OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")]
+                    if limit == OneQuotaHelper::LIMIT_UNLIMITED
+                        "%7s /       -" % [
+                            OpenNebulaHelper.unit_to_str(q['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M")]
+                    else
+                        "%7s / %7s" % [
+                            OpenNebulaHelper.unit_to_str(q['VM_QUOTA']['VM']["MEMORY_USED"].to_i,{},"M"),
+                            OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")]
+                    end
 
                 rescue NoMethodError
                     "-"
@@ -225,12 +239,18 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                     q = quotas[d['ID']]
                     limit = q['VM_QUOTA']['VM']["CPU"]
 
-                    if limit == "-1"
+                    if limit == OneQuotaHelper::LIMIT_DEFAULT
                         limit = pool_default_quotas("VM_QUOTA/VM/CPU")
-                        limit = "0" if limit.nil? || limit == ""
+                        if limit.nil? || limit == ""
+                            limit = OneQuotaHelper::LIMIT_UNLIMITED
+                        end
                     end
 
-                    "%3.1f / %3.1f" % [q['VM_QUOTA']['VM']["CPU_USED"], limit]
+                    if limit == OneQuotaHelper::LIMIT_UNLIMITED
+                        "%3.1f /   -" % [q['VM_QUOTA']['VM']["CPU_USED"]]
+                    else
+                        "%3.1f / %3.1f" % [q['VM_QUOTA']['VM']["CPU_USED"], limit]
+                    end
 
                 rescue NoMethodError
                     "-"

data/lib/one_helper/onevm_helper.rb

@@ -248,8 +248,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         puts str % ["HOST",
             vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']] if
                 %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
-        puts str % ["CLUSTER ID", 
-            vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID'] ] if 
+        puts str % ["CLUSTER ID",
+            vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID'] ] if
                 %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
         puts str % ["START TIME",
             OpenNebulaHelper.time_to_str(vm['/VM/STIME'])]
@@ -380,8 +380,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     array_id += 1
                 end
 
-                if nic.has_key?("IP6_SITE")
-                    ip6_link = {"IP"           => nic.delete("IP6_SITE"),
+                if nic.has_key?("IP6_ULA")
+                    ip6_link = {"IP"           => nic.delete("IP6_ULA"),
                                 "CLI_DONE"     => true,
                                 "DOUBLE_ENTRY" => true}
                     vm_nics.insert(array_id+1,ip6_link)

data/lib/one_helper/onevnet_helper.rb

@@ -18,6 +18,70 @@ require 'one_helper'
 require 'one_helper/onevm_helper'
 
 class OneVNetHelper < OpenNebulaHelper::OneHelper
+    AR = {
+        :name => "ar_id",
+        :short => "-a ar_id",
+        :large => "--address_range ar_id",
+        :format => Integer,
+        :description => "ID of the address range"
+    }
+
+    AR_MAC = {
+        :name => "mac",
+        :short => "-m mac",
+        :large => "--address_range_mac mac",
+        :format => String,
+        :description => "First MAC address in : notation"
+    }
+
+    AR_IP = {
+        :name => "ip",
+        :short => "-i ip",
+        :large => "--address_range_ip ip",
+        :format => String,
+        :description => "First IP address in . notation"
+    }
+
+    AR_SIZE = {
+        :name => "size",
+        :short => "-s size",
+        :large => "--address_range_size size",
+        :format => String,
+        :description => "Number of addresses in the range"
+    }
+
+    AR_IP6_GLOBAL = {
+        :name => "ip6_global",
+        :short => "-g ip6_pref",
+        :large => "--address_range_ip6g ip6_pref",
+        :format => String,
+        :description => "IP6 global prefix"
+    }
+
+    AR_IP6_ULA = {
+        :name => "ip6_ula",
+        :short => "-u ip6_pref",
+        :large => "--address_range_ip6u ip6_pref",
+        :format => String,
+        :description => "IP6 ula prefix"
+    }
+
+    R_NAME = {
+        :name => "rname",
+        :short => "-n reservation name",
+        :large => "--name reservation name",
+        :format => String,
+        :description => "Name of the address reservation"
+    }
+
+    R_SIZE = {
+        :name => "rsize",
+        :short => "-s reservation size",
+        :large => "--size reservation size",
+        :format => String,
+        :description => "Number of addresses to reserve"
+    }
+
     def self.rname
         "VNET"
     end
@@ -26,12 +90,6 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         "onevnet.yaml"
     end
 
-    def self.type_to_str(id)
-        id = id.to_i
-        type_str = VirtualNetwork::VN_TYPES[id]
-        return VirtualNetwork::SHORT_VN_TYPES[type_str]
-    end
-
     def format_pool(options)
         config_file = self.class.table_conf
 
@@ -57,10 +115,6 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
 
             column :CLUSTER, "Name of the Cluster", :left, :size=>10 do |d|
                 OpenNebulaHelper.cluster_str(d["CLUSTER"])
-            end 
-
-            column :TYPE, "Type of Virtual Network", :size=>6 do |d|
-                OneVNetHelper.type_to_str(d["TYPE"])
             end
 
             column :SIZE, "Size of the Virtual Network", :size=>5 do |d|
@@ -74,7 +128,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
 
             column :LEASES, "Number of this Virtual Network's given leases",
                     :size=>6 do |d|
-                d["TOTAL_LEASES"]
+                d["USED_LEASES"]
             end
 
             default :ID, :USER, :GROUP, :NAME, :CLUSTER, :TYPE, :BRIDGE, :LEASES
@@ -109,14 +163,11 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         puts str % ["USER", vn['UNAME']]
         puts str % ["GROUP", vn['GNAME']]
         puts str % ["CLUSTER", OpenNebulaHelper.cluster_str(vn['CLUSTER'])]
-        puts str % ["TYPE", vn.type_str]
         puts str % ["BRIDGE", vn["BRIDGE"]]
         puts str % ["VLAN", OpenNebulaHelper.boolean_to_str(vn['VLAN'])]
         puts str % ["PHYSICAL DEVICE", vn["PHYDEV"]] if !vn["PHYDEV"].empty?
         puts str % ["VLAN ID", vn["VLAN_ID"]] if !vn["VLAN_ID"].empty?
-        puts str % ["GLOBAL PREFIX", vn["GLOBAL_PREFIX"]] if !vn["GLOBAL_PREFIX"].empty?
-        puts str % ["SITE PREFIX", vn["SITE_PREFIX"]] if !vn["SITE_PREFIX"].empty?
-        puts str % ["USED LEASES", vn['TOTAL_LEASES']]
+        puts str % ["USED LEASES", vn['USED_LEASES']]
         puts
 
         CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
@@ -129,45 +180,97 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
 
             puts str % [e,  mask]
         }
+
         puts
 
         CLIHelper.print_header(str_h1 % ["VIRTUAL NETWORK TEMPLATE"], false)
 
         puts vn.template_str(false)
 
-        if vn.type_str == "RANGED"
-            puts
-            CLIHelper.print_header(str_h1 % ["RANGE"], false)
-            puts str % ["IP_START", vn['RANGE/IP_START']]
-            puts str % ["IP_END", vn['RANGE/IP_END']]
+        puts
+
+        CLIHelper.print_header(str_h1 % ["ADDRESS RANGE POOL"], false)
+
+        if !vn.to_hash['VNET']['AR_POOL']['AR'].nil?
+            arlist = [vn.to_hash['VNET']['AR_POOL']['AR']].flatten
         end
 
-        lease_types = [ ["LEASES ON HOLD",  'LEASE[USED=1 and VID=-1]'],
-                        ["USED LEASES",     'LEASE[USED=1 and VID>-1]'],
-                        ["FREE LEASES",     'LEASE[USED=0]'] ]
+        CLIHelper::ShowTable.new(nil, self) do
+            column :AR, "", :size=>3 do |d|
+                    d["AR_ID"]
+            end
 
-        lease_types.each { |pair|
-            leases_str = vn.template_like_str('/VNET/LEASES', false, pair[1])
+            column :TYPE, "", :left, :size=>5 do |d|
+                    d["TYPE"]
+            end
 
-            if !leases_str.empty?
-                puts
-                CLIHelper.print_header(str_h1 % [pair[0]], false)
-                puts leases_str
+            column :SIZE, "", :size=>6 do |d|
+                    d["SIZE"]
             end
-        }
 
-        puts
-        CLIHelper.print_header("VIRTUAL MACHINES", false)
-        puts
+            column :LEASES, "", :size=>6 do |d|
+                    d["USED_LEASES"]
+            end
+
+            column :MAC, "", :size=>17 do |d|
+                    d["MAC"]
+            end
 
-        vms=vn.retrieve_elements("LEASES/LEASE/VID")
+            column :IP, "", :size=>15 do |d|
+                    d["IP"]||"-"
+            end
 
-        if vms
-            vms=vms.delete_if {|vm| vm=="-1" }
-            vms.map!{|e| e.to_i }
-            onevm_helper=OneVMHelper.new
-            onevm_helper.client=@client
-            onevm_helper.list_pool({:ids=>vms}, false)
+            column :GLOBAL_PREFIX, "", :right, :size=>22 do |d|
+                    d["GLOBAL_PREFIX"]||"-"
+            end
+
+        end.show(arlist, {})
+
+        puts
+        CLIHelper.print_header(str_h1 % ["LEASES"], false)
+
+        if !vn.to_hash['VNET']['AR_POOL']['AR'].nil?
+            lease_list = [vn.to_hash['VNET']['AR_POOL']['AR']].flatten
+            leases     = Array.new
+
+            lease_list.each do |ar|
+                id = ar['AR_ID']
+                if ar['LEASES'] && !ar['LEASES']['LEASE'].nil?
+                    lease = [ar['LEASES']['LEASE']].flatten
+                    lease.each do |l|
+                        l['AR_ID'] = id
+                    end
+                    leases << lease
+                end
+            end
+
+            leases.flatten!
         end
+
+        CLIHelper::ShowTable.new(nil, self) do
+            column :AR, "", :left, :size=>3 do |d|
+                d['AR_ID']
+            end
+
+            column :OWNER, "", :left, :size=>10 do |d|
+                if d['VM']
+                    "VM : #{d['VM']}"
+                elsif d['VNET']
+                    "NET: #{d['VNET']}"
+                end
+            end
+
+            column :MAC, "", :size=>17 do |d|
+                    d["MAC"]
+            end
+
+            column :IP, "", :size=>15 do |d|
+                    d["IP"]||"-"
+            end
+
+            column :IP6_GLOBAL, "", :size=>31 do |d|
+                    d["IP6_GLOBAL"]||"-"
+            end
+        end.show(leases, {})
     end
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.6.1
-  prerelease: 
+  version: 4.7.80.beta
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.1
+        version: 4.7.80.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.1
+        version: 4.7.80.beta
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -47,61 +44,60 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- NOTICE
+- bin/oneacct
 - bin/oneacl
-- bin/onehost
-- bin/oneflow-template
-- bin/onevnet
-- bin/oneimage
+- bin/onecluster
 - bin/onedatastore
-- bin/onevm
+- bin/oneflow
+- bin/oneflow-template
 - bin/onegroup
-- bin/onecluster
+- bin/onehost
+- bin/oneimage
 - bin/onetemplate
-- bin/oneflow
 - bin/oneuser
+- bin/onevm
+- bin/onevnet
 - bin/onezone
-- bin/oneacct
-- lib/one_helper.rb
-- lib/command_parser.rb
 - lib/cli_helper.rb
+- lib/command_parser.rb
+- lib/one_helper.rb
+- lib/one_helper/oneacct_helper.rb
+- lib/one_helper/oneacl_helper.rb
+- lib/one_helper/onecluster_helper.rb
+- lib/one_helper/onedatastore_helper.rb
+- lib/one_helper/onegroup_helper.rb
+- lib/one_helper/onehost_helper.rb
+- lib/one_helper/oneimage_helper.rb
 - lib/one_helper/onequota_helper.rb
 - lib/one_helper/onetemplate_helper.rb
-- lib/one_helper/onegroup_helper.rb
-- lib/one_helper/onezone_helper.rb
-- lib/one_helper/onevnet_helper.rb
-- lib/one_helper/onevm_helper.rb
 - lib/one_helper/oneuser_helper.rb
-- lib/one_helper/onedatastore_helper.rb
-- lib/one_helper/onecluster_helper.rb
-- lib/one_helper/oneimage_helper.rb
-- lib/one_helper/oneacl_helper.rb
-- lib/one_helper/oneacct_helper.rb
-- lib/one_helper/onehost_helper.rb
-- NOTICE
-- LICENSE
+- lib/one_helper/onevm_helper.rb
+- lib/one_helper/onevnet_helper.rb
+- lib/one_helper/onezone_helper.rb
 homepage: http://opennebula.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenNebula Command Line Interface
 test_files: []
 has_rdoc: