opennebula-cli 5.0.2 → 5.1.80.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10038339d922cdf1ab6992aa381ed432f3965149
-  data.tar.gz: 11cc0ef4f6ddb062f2ed6641a0fdd7babc6d697a
+  metadata.gz: 5918a18eb88bc2dd352bda44bef92b4e1311ff04
+  data.tar.gz: 91eca333217510670bbb7d4746b329421db599a1
 SHA512:
-  metadata.gz: 058178f751626c5ef3d2839be154e26539cef81bb368076605eefbd0626712bbdb26fd22f3f33d52d159b5e71d632961ec5b9f9ddd28c8a5548a498a63b980fe
-  data.tar.gz: 859c40a5741d92f33108dc8b892a38761095b96c60b42f68aa380c0a56b902e99694bc3fdd4dce09cb351ee9e877b7cb3dfc305c6ddc6b2d42f7a7c51ec9260e
+  metadata.gz: e2d80b573fcc114f130fbee620504dbb92cd9dca78b033a7fc9358f383d685baef15cc55620e902c35ea2e956060612db4b608ab3a607a2fed376044f9611984
+  data.tar.gz: 015e5537a21a89848a682ef1be2dcd30266e6abc9f9a764c106af402f42808d302b9344267e336af4feb2ba8d9a7cb942b7b8aa4556cea72e28dee54467ffab0

data/bin/oneuser

@@ -140,8 +140,49 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Force one_auth file rewrite"
     }
 
+    TOKEN = {
+        :name => "token",
+        :large => "--token token_hint",
+        :format => String,
+        :description => "The Token to be loaded."
+    }
+
+    GROUP = {
+        :name   => "group",
+        :large  => "--group id|name" ,
+        :description => "Effective GID to use with this token.",
+        :format => String,
+        :proc   => lambda { |o, options|
+            OpenNebulaHelper.rname_to_id(o, "GROUP")
+        }
+    }
+
+    GLOBAL = {
+        :name   => "global",
+        :large  => "--global" ,
+        :description => "Find a global Token."
+    }
+
+    STDIN_PASSWORD = {
+        :name => "stdin_password",
+        :large => "--stdin_password",
+        :description => "enable stdin password"
+    }
+
     create_options = [READ_FILE, SHA1, SSH, X509, KEY, CERT, DRIVER]
-    login_options  = [SSH, X509, X509_PROXY, KEY, CERT, PROXY, TIME, FORCE]
+
+    login_options  = [SSH,
+                      X509,
+                      X509_PROXY,
+                      KEY,
+                      CERT,
+                      PROXY,
+                      TIME,
+                      FORCE,
+                      GROUP,
+                      STDIN_PASSWORD]
+
+    set_options = [TOKEN, GLOBAL]
 
     ########################################################################
     # Formatters for arguments
@@ -328,31 +369,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     login_desc = <<-EOT.unindent
-        Creates the login token for authentication. The token can be used
-        together with any authentication driver. The token will be stored in
-        $HOME/.one/one_auth, and can be used subsequently to authenticate with
-        oned through API, CLI or Sunstone.
-
-        Example, request a valid token for a generic driver (e.g. core auth, LDAP...):
-          oneuser login my_user --time 3600
-
-        Example, generate and set a token for SSH based authentication:
-          oneuser login my_user --ssh --key /tmp/id_rsa --time 72000
-
-        Example, same using X509 certificates:
-          oneuser login my_user --x509 --cert /tmp/my_cert.pem
-                                --key /tmp/my_key.pk --time 72000
-
-        Example, now with a X509 proxy certificate
-          oneuser login my_user --x509_proxy --proxy /tmp/my_cert.pem
-                                --time 72000
+        Alias of token-create.
     EOT
 
-    command :login, login_desc, :username, :options=>login_options do
-
-        options[:time] ||= 36000
-
-        helper.login(args[0], options)
+    command :login, login_desc, [:username, nil], :options=>login_options do
+        helper.token_create(args, options)
     end
 
     key_desc = <<-EOT.unindent
@@ -375,7 +396,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         exit_with_code 0
     end
 
-
     delete_desc = <<-EOT.unindent
         Deletes the given User
     EOT
@@ -530,4 +550,207 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         helper.list_pool(options)
     end
+
+    token_add_desc = <<-EOT.unindent
+        Creates the login token for authentication. The token can be used
+        together with any authentication driver. The token will be stored in
+        $HOME/.one/one_auth, and can be used subsequently to authenticate with
+        oned through API, CLI or Sunstone.
+
+        If <username> is ommited, it will infer it from the ONE_AUTH file.
+
+        Example, request a valid token for a generic driver (e.g. core auth, LDAP...):
+          oneuser token-create my_user --time 3600
+
+        Example, request a group spefici token (new resources will be created in that
+        group and only resources that belong to that group will be listed):
+          oneuser token-create my_user --group <id|group>
+
+        Example, generate and set a token for SSH based authentication:
+          oneuser token-create my_user --ssh --key /tmp/id_rsa --time 72000
+
+        Example, same using X509 certificates:
+          oneuser token-create my_user --x509 --cert /tmp/my_cert.pem
+                                --key /tmp/my_key.pk --time 72000
+
+        Example, now with a X509 proxy certificate
+          oneuser token-create my_user --x509_proxy --proxy /tmp/my_cert.pem
+                                --time 72000
+    EOT
+
+    command :"token-create", token_add_desc, [:username, nil],
+            :options=>login_options do
+
+        helper.token_create(args, options)
+    end
+
+    token_set_desc = <<-EOT.unindent
+        Generates a ONE_AUTH file that contains the token.
+
+        You must provide one (and only one) of the following options:
+
+        --token <token>    searches for a token that starts with that string. It must be
+                           unique
+
+        --group <id|group> returns the most durable token that provides access to that
+                           specific group.
+
+        --global           returns the most durable global token (non group specific).
+
+        The argument 'username' is optional, if omitted it is inferred from the ONE_AUTH
+        file.
+
+        Example, set a token:
+          $ oneuser token-set my_user --token 1d47
+          export ONE_AUTH=/var/lib/one/.one/<file>.token; export ONE_EGID=-1
+
+        You can copy & paste the output of the command and will load the proper
+        environment variables.
+    EOT
+
+    command :"token-set", token_set_desc, [:username, nil],
+            :options=>login_options+set_options do
+
+        username = args[0]
+
+        if username
+            if username =~ /^\d+$/
+                exit_with_code 1, "The argument should be the username, not the ID."
+            end
+
+            helper.client = helper.get_login_client(username, options)
+        end
+
+        user = helper.retrieve_resource(OpenNebula::User::SELF)
+
+        rc = user.info
+        if OpenNebula.is_error?(rc)
+            puts rc.message
+            exit_with_code 1, rc.message
+        end
+
+        # Process the options
+        if options[:token]
+            token_hint = options[:token]
+            group = nil
+        elsif options[:group]
+            token_hint = nil
+            group = options[:group]
+        elsif options[:global]
+            token_hint = nil
+            group = -1
+        else
+            exit_with_code 1, "One of these options must be supplied:\n" <<
+            "[--token <token>] [--group <id|group>] [--global]"
+        end
+
+        tokens = helper.find_token(user, token_hint, group, false)
+
+        if tokens.length == 0
+            exit_with_code 1, "No valid tokens found."
+        end
+
+        if token_hint && tokens.length > 1
+            msg = "More than one token starting with '#{token_hint}' found."
+            exit_with_code 1, msg
+        end
+
+        token = tokens[0]["TOKEN"]
+
+        egid  = user["LOGIN_TOKEN[TOKEN='#{token}']/EGID"]
+
+        auth_string = "#{user['NAME']}:#{token}"
+        auth_file   = helper.auth_file(auth_string)
+
+        begin
+            FileUtils.mkdir_p(File.dirname(auth_file))
+        rescue Errno::EEXIST
+        end
+
+        file = File.open(auth_file, "w")
+        file.write(auth_string)
+        file.close
+
+        File.chmod(0600, auth_file)
+
+        msg ="export ONE_AUTH=" + auth_file
+        msg << "; export ONE_EGID=#{egid}" if egid
+
+        exit_with_code 0, msg
+    end
+
+    token_delete_desc = <<-EOT.unindent
+        Expires a token and removes the associated ONE_AUTH file if present.
+    EOT
+
+    command :"token-delete", token_delete_desc, [:username, nil], :token,
+            :options=>login_options do
+
+        if args.length == 1
+            token_hint = args[0]
+        else
+            username, token_hint = args
+        end
+
+        if username
+            helper.client = helper.get_login_client(username, options)
+        end
+
+        user = helper.retrieve_resource(OpenNebula::User::SELF)
+
+        rc = user.info
+        if OpenNebula.is_error?(rc)
+            puts rc.message
+            exit_with_code 1, rc.message
+        end
+
+        token = helper.find_token(user, token_hint, nil, true)
+
+        if token.count > 1
+            exit_with_code 1, "More than one token starting with '#{token_hint}' found."
+        elsif token.count == 0
+            exit_with_code 1, "No tokens found."
+        end
+
+        token = token[0]["TOKEN"]
+
+        rc = user.login(user['NAME'], token, 0)
+
+        if OpenNebula.is_error?(rc)
+            puts rc.message
+            exit_with_code 1, rc.message
+        else
+            puts "Token removed."
+        end
+
+        auth_string = "#{user['NAME']}:#{token}"
+        auth_file   = helper.auth_file(auth_string)
+
+        begin
+            File.unlink(auth_file)
+            puts "Removing #{auth_file}"
+        rescue Errno::ENOENT
+        end
+
+        0
+    end
+
+    token_delete_all = <<-EOT.unindent
+        Delete all the tokens of a user. This command is intented to be executed by a
+        user that has MANAGE permissions of the target user.
+    EOT
+
+    command :"token-delete-all", token_delete_all, :username,
+            :options=>login_options do
+
+        username = args[0]
+
+        if username =~ /^\d+$/
+            exit_with_code 1, "The argument should be the username, not the ID."
+        end
+
+        helper.perform_action(username, options, "Tokens expired") do |user|
+            user.login(username, "", 0)
+        end
+    end
 end

data/bin/onevcenter

@@ -35,6 +35,25 @@ require 'one_helper/onehost_helper'
 require 'one_helper/onecluster_helper'
 require 'vcenter_driver'
 
+def connection_options(object_name, options)
+    if  options[:vuser].nil? ||
+        options[:vcenter].nil?
+        STDERR.puts "vCenter connection parameters are mandatory to import"\
+                    " #{object_name}:\n"\
+                    "\t --vcenter vCenter hostname\n"\
+                    "\t --vuser username to login in vcenter"
+        exit -1
+    end
+
+    password = options[:vpass] || OpenNebulaHelper::OneHelper.get_password
+
+    {
+       :user     => options[:vuser],
+       :password => password,
+       :host     => options[:vcenter]
+    }
+end
+
 cmd=CommandParser::CmdParser.new(ARGV) do
 
     usage "`onevcenter` <command> [<args>] [<options>]"
@@ -82,24 +101,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :hosts, hosts_desc, :options=>[ VCENTER, USER, PASS ] do
-        if  options[:vuser].nil? ||
-            options[:vpass].nil? ||
-            options[:vcenter].nil?
-            STDERR.puts "vCenter connection parameters are mandatory to import"\
-                        " host:\n"\
-                        "\t --vcenter vCenter hostname\n"\
-                        "\t --vuser username to login in vcenter\n"\
-                        "\t --vpass password for the user"
-            exit -1
-        end
+        con_ops = connection_options("Hosts", options)
 
         begin
             STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
 
-            vc = VCenterDriver::VIClient.new_connection(
-                    :user     => options[:vuser],
-                    :password => options[:vpass],
-                    :host     => options[:vcenter])
+            vc = VCenterDriver::VIClient.new_connection(con_ops)
 
             STDOUT.print "done!\n\n"
 
@@ -149,24 +156,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :templates, templates_desc, :options=>[ VCENTER, USER, PASS ] do
-        if  options[:vuser].nil? ||
-            options[:vpass].nil? ||
-            options[:vcenter].nil?
-            STDERR.puts "vCenter connection parameters are mandatory to import"\
-                        " VM templates:\n"\
-                        "\t --vcenter vCenter hostname\n"\
-                        "\t --vuser username to login in vcenter\n"\
-                        "\t --vpass password for the user"
-            exit -1
-        end
+        con_ops = connection_options("VM Templates", options)
 
         begin
             STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
 
-            vc = VCenterDriver::VIClient.new_connection(
-                    :user     => options[:vuser],
-                    :password => options[:vpass],
-                    :host     => options[:vcenter])
+            vc = VCenterDriver::VIClient.new_connection(con_ops)
 
             STDOUT.print "done!\n\n"
 
@@ -373,24 +368,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :networks, network_desc, :options=>[ VCENTER, USER, PASS ] do
-        if  options[:vuser].nil? ||
-            options[:vpass].nil? ||
-            options[:vcenter].nil?
-            STDERR.puts "vCenter connection parameters are mandatory to import"\
-                        " vCenter networks:\n"\
-                        "\t --vcenter vCenter hostname\n"\
-                        "\t --vuser username to login in vcenter\n"\
-                        "\t --vpass password for the user"
-            exit -1
-        end
+        con_ops = connection_options("Networks", options)
 
         begin
             STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
 
-            vc = VCenterDriver::VIClient.new_connection(
-                    :user     => options[:vuser],
-                    :password => options[:vpass],
-                    :host     => options[:vcenter])
+            vc = VCenterDriver::VIClient.new_connection(con_ops)
 
             STDOUT.print "done!\n\n"
 
@@ -516,24 +499,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :datastores, datastores_desc, :options=>[ VCENTER, USER, PASS ] do
-        if  options[:vuser].nil? ||
-            options[:vpass].nil? ||
-            options[:vcenter].nil?
-            STDERR.puts "vCenter connection parameters are mandatory to import"\
-                        " Datastores:\n"\
-                        "\t --vcenter vCenter hostname\n"\
-                        "\t --vuser username to login in vcenter\n"\
-                        "\t --vpass password for the user"
-            exit -1
-        end
+        con_ops = connection_options("Datastores", options)
 
         begin
             STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
 
-            vc = VCenterDriver::VIClient.new_connection(
-                    :user     => options[:vuser],
-                    :password => options[:vpass],
-                    :host     => options[:vcenter])
+            vc = VCenterDriver::VIClient.new_connection(con_ops)
 
             STDOUT.print "done!\n\n"
 
@@ -600,24 +571,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             exit -1
         end
 
-        if  options[:vuser].nil? ||
-            options[:vpass].nil? ||
-            options[:vcenter].nil?
-            STDERR.puts "vCenter connection parameters are mandatory to import"\
-                        " Datastores:\n"\
-                        "\t --vcenter vCenter hostname\n"\
-                        "\t --vuser username to login in vcenter\n"\
-                        "\t --vpass password for the user"
-            exit -1
-        end
+        con_ops = connection_options("Images", options)
 
         begin
             STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
 
-            vc = VCenterDriver::VIClient.new_connection(
-                    :user     => options[:vuser],
-                    :password => options[:vpass],
-                    :host     => options[:vcenter])
+            vc = VCenterDriver::VIClient.new_connection(con_ops)
 
             STDOUT.print "done!\n\n"
 

data/lib/cli_helper.rb

@@ -25,6 +25,14 @@ module CLIHelper
         :description => "Selects columns to display with list command"
     }
 
+    LISTCONF = {
+        :name   => "listconf",
+        :short  => "-c conf",
+        :large  => "--listconf conf",
+        :format => String,
+        :description => "Selects a predefined column list"
+    }
+
     CSV_OPT = {
         :name  => "csv",
         :large => "--csv",
@@ -64,7 +72,7 @@ module CLIHelper
     }
 
     #OPTIONS = [LIST, ORDER, FILTER, HEADER, DELAY]
-    OPTIONS = [LIST, DELAY, FILTER, CSV_OPT]
+    OPTIONS = [LIST, LISTCONF, DELAY, FILTER, CSV_OPT]
 
     # Sets bold font
     def CLIHelper.scr_bold
@@ -320,7 +328,20 @@ module CLIHelper
                 config = YAML.load_file(@conf)
 
                 default = config.delete(:default)
-                @default_columns = default unless default.empty?
+                default_conf = config.delete(:default_conf) || {}
+                listconf = options[:listconf]
+
+                listconf = default_conf[listconf.to_sym] if listconf
+
+                if !listconf && ENV['ONE_LISTCONF']
+                    listconf = default_conf[ENV['ONE_LISTCONF'].to_sym]
+                end
+
+                if listconf
+                    @default_columns = listconf
+                else
+                    @default_columns = default unless default.empty?
+                end
 
                 # Filter show options with available columns
                 @default_columns &= @columns.keys

data/lib/one_helper.rb

@@ -936,6 +936,27 @@ EOT
 
         objects.each do |obj|
             obj, *extra_attributes = obj.split(":")
+
+            # When extra attributes do not contain = character include
+            # them in the previous value. Fixes adding MAC addresses. These
+            # contain ":" character also used as extra attributes separator.
+            #
+            # It may be needed to strip the value from start and end quotes
+            # as the value could be written as this:
+            #
+            # --nic 'some_net:mac="00:0A:12:34:56:78"'
+            #
+            attrs = []
+            extra_attributes.each do |str|
+                if str.include?("=")
+                    attrs << str
+                else
+                    attrs.last << ":#{str}"
+               end
+            end
+
+            extra_attributes = attrs
+
             res=parse_user_object(obj)
             return [-1, "#{section.capitalize} \"#{obj}\" malformed"] if !res
             user, object=*res

data/lib/one_helper/oneuser_helper.rb

@@ -17,6 +17,8 @@
 require 'one_helper'
 require 'one_helper/onequota_helper'
 
+require 'digest/md5'
+
 # Interface for OpenNebula generated tokens.
 class TokenAuth
     def login_token(username, expire)
@@ -26,7 +28,7 @@ end
 
 class OneUserHelper < OpenNebulaHelper::OneHelper
 
-    ONE_AUTH     = ENV['HOME']+'/.one/one_auth'
+    ONE_AUTH = ENV['HOME']+'/.one/one_auth'
 
     def self.rname
         "USER"
@@ -100,11 +102,12 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         return 0, auth.password
     end
 
-    ############################################################################
-    # Generates a token and stores it in ONE_AUTH path as defined in this class
-    ############################################################################
-    def login(username, options)
+    def auth_file(auth_string)
+        auth_filename = Digest::MD5.hexdigest(auth_string)
+        ENV['HOME'] + "/.one/#{auth_filename}.token"
+    end
 
+    def get_login_client(username, options)
         #-----------------------------------------------------------------------
         # Init the associated Authentication class to generate the token.
         #-----------------------------------------------------------------------
@@ -172,14 +175,30 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
             sync = true
         end
 
-        token        = auth.login_token(username, options[:time])
-        login_client = OpenNebula::Client.new("#{username}:#{token}",
-                                              nil,
-                                              :sync => sync)
+        if options[:stdin_password]
+            token = STDIN.read.strip
+        else
+            token = auth.login_token(username, options[:time])
+        end
+
+        OpenNebula::Client.new("#{username}:#{token}", nil, :sync => sync)
+    end
+
+    ############################################################################
+    # Generates a token and stores it in ONE_AUTH path as defined in this class
+    ############################################################################
+    def login(username, options, use_client=false)
+        if use_client
+            login_client = OpenNebulaHelper::OneHelper.get_client
+        else
+            login_client = self.get_login_client(username, options)
+        end
 
         user = OpenNebula::User.new(User.build_xml, login_client)
 
-        token_oned = user.login(username, "", options[:time])
+        egid = options[:group] || -1
+
+        token_oned = user.login(username, "", options[:time], egid)
 
         return -1, token_oned.message if OpenNebula.is_error?(token_oned)
 
@@ -378,6 +397,72 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         table
     end
 
+    def find_token(user, token, group=nil, show_expired=false)
+        user_hash = user.to_hash
+
+        valid_tokens = [user_hash["USER"]["LOGIN_TOKEN"]].flatten.compact
+
+        return [] if valid_tokens.empty?
+
+        valid_tokens.map! do |e|
+            if token
+                next if !e["TOKEN"].start_with?(token)
+            end
+
+            exp_time = e["EXPIRATION_TIME"].to_i
+            if group
+                next if e["EGID"].to_i != group.to_i
+            end
+
+            if !show_expired
+                next if exp_time != -1 && Time.now > Time.at(exp_time)
+            end
+
+            e
+        end.compact!
+
+        # Sort the tokens so it returns first the one that will expire the
+        # latest.
+
+        valid_tokens.sort! do |a,b|
+            a_exp = a["EXPIRATION_TIME"].to_i
+            b_exp = b["EXPIRATION_TIME"].to_i
+
+            if a_exp == -1 || b_exp == -1
+                a_exp <=> b_exp
+            else
+                b_exp <=> a_exp
+            end
+        end
+
+        valid_tokens
+    end
+
+    def get_client_user
+        user = self.retrieve_resource(OpenNebula::User::SELF)
+        rc   = user.info
+        if OpenNebula.is_error?(rc)
+            puts rc.message
+            exit_with_code 1, rc.message
+        end
+        user
+    end
+
+    def token_create(args, options)
+        options[:time] ||= 36000
+
+        if args[0]
+            username = args[0]
+            use_client = false
+        else
+            user = self.get_client_user
+            username = user['NAME']
+            use_client = true
+        end
+
+        self.login(username, options, use_client)
+    end
+
     private
 
     def factory(id=nil)
@@ -409,31 +494,64 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         puts str % ["SECONDARY GROUPS", groups.join(',') ] if groups.size > 1
         puts str % ["PASSWORD",    user['PASSWORD']]
         puts str % ["AUTH_DRIVER", user['AUTH_DRIVER']]
+        puts str % ["ENABLED",
+            OpenNebulaHelper.boolean_to_str(user['ENABLED'])]
+        puts
 
-        if !user['LOGIN_TOKEN/TOKEN'].nil?
-            puts str % ["LOGIN_TOKEN", user['LOGIN_TOKEN/TOKEN']]
+        user_hash = user.to_hash
+        client    = @client
 
-            etime = user['LOGIN_TOKEN/EXPIRATION_TIME']
+        gid = user['GID']
+        tokens = [user_hash['USER']['LOGIN_TOKEN']].flatten.compact
 
-            validity_str = case etime
-                when nil  then ""
-                when "-1" then "forever"
-                else "not after #{Time.at(etime.to_i)}"
-            end
+        CLIHelper.print_header(str_h1 % "TOKENS",false)
+        if tokens && !tokens.empty?
+            CLIHelper::ShowTable.new(nil, self) do
+                column :ID, "", :size=>7 do |d|
+                    d["TOKEN"]
+               end
 
-            puts str % ["TOKEN VALIDITY", validity_str ]
-        end
+                column :EGID, "", :left, :size=>5 do |d|
+                    d["EGID"].to_i == -1 ? "*" + gid : d["EGID"]
+                end
 
-        puts str % ["ENABLED",
-            OpenNebulaHelper.boolean_to_str(user['ENABLED'])]
+                column :EGROUP, "", :left, :size=>10 do |d|
+                    client = OpenNebulaHelper::OneHelper.get_client
+
+                    egid = d["EGID"].to_i == -1 ? gid : d["EGID"]
+
+                    group = Group.new_with_id(egid, client)
+                    rc = group.info
+
+                    if OpenNebula.is_error?(rc)
+                        "-"
+                    else
+                        group['NAME']
+                    end
+                end
+
+                column :EXPIRATION, "", :left, :size=>20 do |d|
+                    etime = d["EXPIRATION_TIME"]
+                    expired = Time.now >= Time.at(d["EXPIRATION_TIME"].to_i)
+                    case etime
+                    when nil  then ""
+                    when "-1" then "forever"
+                    else
+                        if expired
+                            "expired"
+                        else
+                            Time.at(etime.to_i).to_s
+                        end
+                    end
+                end
+            end.show(tokens,{})
+        end
 
         puts
 
         CLIHelper.print_header(str_h1 % "USER TEMPLATE",false)
         puts user.template_str
 
-        user_hash = user.to_hash
-
         default_quotas = nil
 
         user.each('/USER/DEFAULT_USER_QUOTAS') { |elem|
@@ -443,4 +561,5 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         helper = OneQuotaHelper.new
         helper.format_quota(user_hash['USER'], default_quotas, user.id)
     end
+
 end

data/lib/one_helper/onevnet_helper.rb

@@ -254,6 +254,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
             puts str % ["SIZE", ar["SIZE"]]
             puts str % ["LEASES", ar["USED_LEASES"]]
             puts str % ["VN_MAD", ar["VN_MAD"]] if ar["VN_MAD"]
+            puts str % ["IPAM_MAD", ar["IPAM_MAD"]] if ar["IPAM_MAD"]
             puts
 
             format = "%-10s %34s %34s"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.80.beta1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,18 +16,19 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.80.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.80.beta1
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
 - oneuser.backup
+- oneacct
 - oneacl
 - onecluster
 - onedatastore
@@ -35,20 +36,19 @@ executables:
 - oneflow-template
 - onegroup
 - onehost
+- oneimage
 - onemarket
 - onemarketapp
 - onesecgroup
 - oneshowback
 - onetemplate
 - onevdc
+- onevm
 - onevnet
+- onevrouter
 - onezone
-- oneimage
-- onevm
-- oneacct
-- onevcenter
 - oneuser
-- onevrouter
+- onevcenter
 extensions: []
 extra_rdoc_files: []
 files:
@@ -112,9 +112,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1