opennebula-cli 5.3.80.beta1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e15bbf71c016c51a6c4d926c42e0b1dd4f5f49f8
-  data.tar.gz: fcd4ffdb5d5f25300f2b652ff1ad082ee45d0c3e
+  metadata.gz: 8548f70bb2a40ff7eea3a067c31d288e412ad206
+  data.tar.gz: 5a869b56b4726a7c875922741f94fabd703f7eeb
 SHA512:
-  metadata.gz: 22f98b03d7880441572a20e1236c4975357031a645854d9ab441fa3c177cefa0d5152ab0d0ca9cd8ea58b4e2158e5efa9343a1279595f4473ec591911be38827
-  data.tar.gz: 83b293f1adac28bf9e75102e49968eebbf50b45c0be4aa1f7ed5f28fc0a6954b9befe4b48eba9f66d5eabce74b84dc4ae2863e12ebb7c91775c055e28cfb805f
+  metadata.gz: 429fa23813dfdf1d8374bcd5448aff4692284040b0148d00dacf491f7520ed8bda4f454a8aa4e4476c513184acf1505f076e76f4720920a7d3203cb91d5f9fbc
+  data.tar.gz: 639c78f877b042775a9c5b7baa493f0efda0314572293358f35292076b53f4fe80f204cb526b7fb8436b35acabde32e819ba9f87478030396fdac92fedac23ab

data/bin/onehost

@@ -79,21 +79,15 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             " rsync command must be installed in the frontend and nodes."
     }
 
-    EC2_ACCESS = {
-        :name   => "ec2access",
-        :large  => "--ec2access id",
-        :description => "Set the id access for EC2 Driver",
+    TYPE = {
+        :name  => "type",
+        :short => "-t remote_provider",
+        :large => "--type remote_provider",
+        :description => "Use type to create a host using Cloud Bursting ",
         :format => String
     }
 
-    EC2_SECRET = {
-        :name   => "ec2secret",
-        :large  => "--ec2secret key",
-        :description => "Set the secret key for EC2 Driver",
-        :format => String
-    }
-
-    CREAT_OPTIONS = [ IM, VMM, OneClusterHelper::CLUSTER, EC2_ACCESS, EC2_SECRET ]
+    CREAT_OPTIONS = [ IM, VMM, OneClusterHelper::CLUSTER, TYPE ]
     SYNC_OPTIONS  = [ OneClusterHelper::CLUSTER, FORCE, RSYNC ]
 
     ########################################################################
@@ -116,7 +110,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Creates a new Host
     EOT
 
-    command :create, create_desc, :hostname, :options=>CREAT_OPTIONS do
+    command :create, create_desc, :hostname, [:file, nil], :options=>CREAT_OPTIONS do
         if options[:im].nil? || options[:vm].nil?
             STDERR.puts "Drivers are mandatory to create a host:"
             STDERR.puts "\t -i information driver"
@@ -124,20 +118,15 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             exit -1
         end
 
-        ec2_host = !options[:ec2access].nil? && !options[:ec2secret].nil?
-
         cid = options[:cluster] || ClusterPool::NONE_CLUSTER_ID
         helper.create_resource(options) do |host|
-                rc = host.allocate(args[0], options[:im], options[:vm], cid)
-
-                if ec2_host && !OpenNebula.is_error?(rc)
-               	    template = "EC2_ACCESS=\"#{options[:ec2access]}\"\n"\
-               		    "EC2_SECRET=\"#{options[:ec2secret]}\"\n"\
-
-                    rc = host.update(template, true)
-                end
+            if !options[:type].nil?
+                str = helper.set_hybrid(options[:type], args[1])
+            end
+            rc = host.allocate(args[0], options[:im], options[:vm], cid)
+            host.update(str, true) if !OpenNebula.is_error?(rc) && !options[:type].nil?
 
-                rc
+            rc
         end
     end
 

data/bin/oneuser

@@ -33,14 +33,26 @@ require 'one_helper/onequota_helper'
 
 require 'uri'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
+cmd = CommandParser::CmdParser.new(ARGV) do
     usage "`oneuser` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneUserHelper.new
 
     before_proc do
-        helper.set_client(options) if ![:key].include?(@comm_name)
+        if ![:key].include?(@comm_name)
+            begin
+                helper.set_client(options)
+            rescue Exception => e
+                STDERR.puts e.message
+
+                if e.message != OpenNebula::Client::NO_ONE_AUTH_ERROR
+                    STDERR.puts e.backtrace
+                end
+
+                exit 1
+            end
+        end
     end
 
     ########################################################################

data/lib/one_helper.rb

@@ -492,20 +492,6 @@ EOT
         end
 
 
-        # receive a object key => value format
-        # returns hashed values
-        def encrypt(opts, token)
-            res = {}
-            opts.each do |key, value|
-                cipher = OpenSSL::Cipher::AES.new(256,:CBC)
-                cipher.encrypt.key = token[0..31]
-                encrypted = cipher.update(value) + cipher.final
-                res[key] = Base64::encode64(encrypted) 
-            end
-            
-            return res
-        end
-
         def list_pool(options, top=false, filter_flag=nil)
             if options[:describe]
                 table = format_pool(options)

data/lib/one_helper/onehost_helper.rb

@@ -20,6 +20,32 @@ require 'rubygems'
 
 class OneHostHelper < OpenNebulaHelper::OneHelper
     TEMPLATE_XPATH  = '//HOST/TEMPLATE'
+    HYBRID = {
+        :ec2 => {
+            :help => <<-EOT.unindent,
+                #-----------------------------------------------------------------------
+                # Supported EC2 AUTH ATTRIBUTTES:
+                #
+                #  REGION_NAME = <the name of the ec2 region>
+                #
+                #  EC2_ACCESS = <Your ec2 access key id>
+                #  EC2_SECRET = <Your ec2 secret key>
+                #
+                #  CAPACITY = [
+                #    M1SMALL  = <number of machines m1.small>,
+                #    M1XLARGE = <number of machines m1.xlarge>,
+                #    M1LARGE  = <number of machines m1.large>
+                #  ]
+                #
+                # You can set any machine type supported by ec2
+                # See your ec2_driver.conf for more information
+                #
+                #-----------------------------------------------------------------------
+                EOT
+        }
+    }
+
+
     VERSION_XPATH   = "#{TEMPLATE_XPATH}/VERSION"
 
     def self.rname
@@ -164,6 +190,12 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         table
     end
 
+    def set_hybrid(type, path)
+        k = type.to_sym
+        if HYBRID.key?(k)
+            str = path.nil? ?  OpenNebulaHelper.editor_input(HYBRID[k][:help]): File.read(path)
+        end
+    end
 
     NUM_THREADS = 15
     def sync(host_ids, options)
@@ -230,10 +262,14 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
             vm_mad = host['VM_MAD'].downcase
             remote_remotes = host['TEMPLATE/REMOTE_REMOTES']
+            state = host['STATE']
 
             # Skip this host from remote syncing if it's a PUBLIC_CLOUD host
             next if host['TEMPLATE/PUBLIC_CLOUD'] == 'YES'
 
+            # Skip this host from remote syncing if it's OFFLINE
+            next if Host::HOST_STATES[state.to_i] == 'OFFLINE'
+
             host_version=host['TEMPLATE/VERSION']
 
             begin

data/lib/one_helper/oneimage_helper.rb

@@ -290,7 +290,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             puts str % [e,  mask]
         }
 
-        if image.has_elements?("/IMAGE/SNAPSHOTS")
+        if image.has_elements?("/IMAGE/SNAPSHOTS/SNAPSHOT")
             puts
             CLIHelper.print_header(str_h1 % "IMAGE SNAPSHOTS",false)
             format_snapshots(image)
@@ -361,7 +361,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
 
         # Convert snapshot data to an array
         image_hash = image.to_hash
-        image_snapshots = [image_hash['IMAGE']['SNAPSHOTS']].flatten.first
+        image_snapshots = [image_hash['IMAGE']['SNAPSHOTS']['SNAPSHOT']].flatten
         table.show(image_snapshots)
     end
 

data/lib/one_helper/oneuser_helper.rb

@@ -27,11 +27,14 @@ class TokenAuth
 end
 
 class OneUserHelper < OpenNebulaHelper::OneHelper
-
-    if ENV['HOME']
-        ONE_AUTH = ENV['HOME']+'/.one/one_auth'
+    if ENV['ONE_AUTH']
+        ONE_AUTH = ENV['ONE_AUTH']
     else
-        ONE_AUTH = "/var/lib/one/.one/one_auth"
+        if ENV['HOME']
+            ONE_AUTH = ENV['HOME']+'/.one/one_auth'
+        else
+            ONE_AUTH = "/var/lib/one/.one/one_auth"
+        end
     end
 
     def self.rname
@@ -206,12 +209,14 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
         return -1, token_oned.message if OpenNebula.is_error?(token_oned)
 
+        token_info = "Authentication Token is:\n#{username}:#{token_oned}"
+
         #-----------------------------------------------------------------------
         # Check that ONE_AUTH target can be written
         #-----------------------------------------------------------------------
         if File.file?(ONE_AUTH) && !options[:force]
                 return 0, "File #{ONE_AUTH} exists, use --force to overwrite."\
-                "\nAuthentication Token is:\n#{username}:#{token_oned}"
+                "\n#{token_info}"
         end
 
         #-----------------------------------------------------------------------
@@ -228,7 +233,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
         File.chmod(0600, ONE_AUTH)
 
-        return 0, ''
+        return 0, token_info
     end
 
     def format_pool(options)
@@ -459,6 +464,10 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
             username = args[0]
             use_client = false
         else
+            if !defined?(@@client)
+                return -1, "No username in the argument or valid ONE_AUTH found."
+            end
+
             user = self.get_client_user
             username = user['NAME']
             use_client = true

data/lib/one_helper/onevm_helper.rb

@@ -578,7 +578,7 @@ in the frontend machine.
             vm_disks = [vm_hash['VM']['TEMPLATE']['DISK']].flatten
         end
 
-        if vm.has_elements?("/VM/TEMPLATE/CONTEXT")
+        if vm.has_elements?("/VM/TEMPLATE/CONTEXT") && vm["/VM/HISTORY_RECORDS/HISTORY[1]/VM_MAD"] != 'vcenter'
             context_disk = vm_hash['VM']['TEMPLATE']['CONTEXT']
 
             context_disk["IMAGE"]     = "CONTEXT"

data/lib/one_helper/onezone_helper.rb

@@ -147,14 +147,34 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
                      when "3" then "leader"
                      else "-"
                  end
-                s["TERM"]     = xml_doc.root.at_xpath("TERM").text
+                s["TERM"]      = xml_doc.root.at_xpath("TERM").text
                 s["VOTEDFOR"]  = xml_doc.root.at_xpath("VOTEDFOR").text
                 s["COMMIT"]    = xml_doc.root.at_xpath("COMMIT").text
-                s["LOG_INDEX"] = xml_doc.root.at_xpath("LOG_INDEX").text
+
+                s["LOG_INDEX"]    = xml_doc.root.at_xpath("LOG_INDEX").text
+                s["FEDLOG_INDEX"] = xml_doc.root.at_xpath("FEDLOG_INDEX").text
             }
 
             puts
-            CLIHelper.print_header(str_h1 % "SERVERS",false)
+            CLIHelper.print_header(str_h1 % "ZONE SERVERS",false)
+
+            CLIHelper::ShowTable.new(nil, self) do
+
+                column :"ID", "", :size=>2 do |d|
+                    d["ID"] if !d.nil?
+                end
+
+                column :"NAME", "", :left, :size=>15 do |d|
+                    d["NAME"] if !d.nil?
+                end
+
+                column :"ENDPOINT", "", :left, :size=>63 do |d|
+                    d["ENDPOINT"] if !d.nil?
+                end
+            end.show([zone_hash['ZONE']['SERVER_POOL']['SERVER']].flatten, {})
+
+            puts
+            CLIHelper.print_header(str_h1 % "HA & FEDERATION SYNC STATUS",false)
 
             CLIHelper::ShowTable.new(nil, self) do
 
@@ -186,9 +206,10 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
                     d["VOTEDFOR"] if !d.nil?
                 end
 
-                column :"ENDPOINT", "", :left, :size=>18 do |d|
-                    d["ENDPOINT"] if !d.nil?
+                column :"FED_INDEX", "", :left, :size=>10 do |d|
+                    d["FEDLOG_INDEX"] if !d.nil?
                 end
+
             end.show([zone_hash['ZONE']['SERVER_POOL']['SERVER']].flatten, {})
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.3.80.beta1
+  version: 5.4.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,40 +16,39 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.3.80.beta1
+        version: 5.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.3.80.beta1
+        version: 5.4.0
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
-- oneuser.backup
-- oneacct
-- oneacl
-- onecluster
-- onedatastore
-- oneflow
+- onehost
+- onevcenter
 - oneflow-template
-- onegroup
-- oneimage
-- onemarket
-- onemarketapp
-- onesecgroup
-- oneshowback
-- onetemplate
 - oneuser
-- onevcenter
 - onevdc
-- onevm
-- onevmgroup
+- onesecgroup
+- oneacct
+- oneflow
 - onevnet
+- oneshowback
 - onevrouter
+- onevmgroup
+- onemarket
 - onezone
-- onehost
+- onecluster
+- oneacl
+- onemarketapp
+- onedatastore
+- onevm
+- onegroup
+- onetemplate
+- oneimage
 extensions: []
 extra_rdoc_files: []
 files:
@@ -70,7 +69,6 @@ files:
 - bin/oneshowback
 - bin/onetemplate
 - bin/oneuser
-- bin/oneuser.backup
 - bin/onevcenter
 - bin/onevdc
 - bin/onevm
@@ -115,9 +113,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11

data/bin/oneuser.backup

@@ -1,522 +0,0 @@
-#!/usr/bin/env ruby
-
-# -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
-#                                                                            #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
-# not use this file except in compliance with the License. You may obtain    #
-# a copy of the License at                                                   #
-#                                                                            #
-# http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                            #
-# Unless required by applicable law or agreed to in writing, software        #
-# distributed under the License is distributed on an "AS IS" BASIS,          #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-# See the License for the specific language governing permissions and        #
-# limitations under the License.                                             #
-#--------------------------------------------------------------------------- #
-
-ONE_LOCATION=ENV["ONE_LOCATION"]
-
-if !ONE_LOCATION
-    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
-else
-    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
-end
-
-$: << RUBY_LIB_LOCATION
-$: << RUBY_LIB_LOCATION+"/cli"
-
-require 'command_parser'
-require 'one_helper/oneuser_helper'
-require 'one_helper/onequota_helper'
-
-require 'uri'
-
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`oneuser` <command> [<args>] [<options>]"
-    version OpenNebulaHelper::ONE_VERSION
-
-    helper = OneUserHelper.new
-
-    before_proc do
-        helper.set_client(options) if ![:login, :key].include?(@comm_name)
-    end
-
-    ########################################################################
-    # Global Options
-    ########################################################################
-    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
-
-    list_options = CLIHelper::OPTIONS
-    list_options << OpenNebulaHelper::XML
-    list_options << OpenNebulaHelper::NUMERIC
-    list_options << OpenNebulaHelper::DESCRIBE
-
-    READ_FILE={
-        :name => "read_file",
-        :short => "-r",
-        :large => "--read-file",
-        :description => "Read password from file"
-    }
-
-    SHA1={
-        :name => "sha1",
-        :large => "--sha1",
-        :description => "The password will be hashed using the sha1\n"<<
-                        " "*31<<"algorithm"
-    }
-
-    SSH={
-        :name => "ssh",
-        :large => "--ssh",
-        :description => "SSH Auth system",
-        :proc => lambda { |o, options|
-            options[:driver] = OpenNebula::User::SSH_AUTH
-        }
-    }
-
-    X509={
-        :name => "x509",
-        :large => "--x509",
-        :description => "x509 Auth system for x509 certificates",
-        :proc => lambda { |o, options|
-            options[:driver] = OpenNebula::User::X509_AUTH
-        }
-    }
-
-    X509_PROXY={
-        :name => "x509_proxy",
-        :large => "--x509_proxy",
-        :description => "x509 Auth system based on x509 proxy certificates",
-        :proc => lambda { |o, options|
-            options[:driver] = OpenNebula::User::X509_PROXY_AUTH
-        }
-    }
-
-    KEY={
-        :name => "key",
-        :short => "-k path_to_private_key_pem",
-        :large => "--key path_to_private_key_pem",
-        :format => String,
-        :description => "Path to the Private Key of the User"
-    }
-
-    CERT={
-        :name => "cert",
-        :short => "-c path_to_user_cert_pem",
-        :large => "--cert path_to_user_cert_pem",
-        :format => String,
-        :description => "Path to the Certificate of the User"
-    }
-
-    PROXY={
-        :name => "proxy",
-        :large => "--proxy path_to_user_proxy_pem",
-        :format => String,
-        :description => "Path to the user proxy certificate"
-    }
-
-    TIME={
-        :name  => "time",
-        :large => "--time x",
-        :format => Integer,
-        :description => "Token duration in seconds, defaults to 36000 (10 h). "\
-                        "To reset the token set time to 0." \
-                        "To generate a non-expiring token use -1"\
-                        " (not valid for ssh and x509 tokens). "\
-    }
-
-    DRIVER={
-        :name => "driver",
-        :large => "--driver driver",
-        :format => String,
-        :description => "Driver to autehnticate this user"
-    }
-
-    FORCE = {
-        :name   => "force",
-        :large  => "--force" ,
-        :description => "Force one_auth file rewrite"
-    }
-
-    create_options = [READ_FILE, SHA1, SSH, X509, KEY, CERT, DRIVER]
-    login_options  = [SSH, X509, X509_PROXY, KEY, CERT, PROXY, TIME, FORCE]
-
-    ########################################################################
-    # Formatters for arguments
-    ########################################################################
-    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "GROUP")
-    end
-
-    set :format, :userid, OneUserHelper.to_id_desc do |arg|
-        helper.to_id(arg)
-    end
-
-    set :format, :userid_list, OneUserHelper.list_to_id_desc do |arg|
-        helper.list_to_id(arg)
-    end
-
-    set :format, :password, OneUserHelper.password_to_str_desc do |arg|
-        OneUserHelper.password_to_str(arg, options)
-    end
-
-    ########################################################################
-    # Commands
-    ########################################################################
-
-    create_desc = <<-EOT.unindent
-        Creates a new User
-        Examples:
-          oneuser create my_user my_password
-          oneuser create my_user -r /tmp/mypass
-          oneuser create my_user --ssh --key /tmp/id_rsa
-          oneuser create my_user --ssh -r /tmp/public_key
-          oneuser create my_user --x509 --cert /tmp/my_cert.pem
-    EOT
-
-    command :create, create_desc, :username, [:password, nil],
-            :options=>create_options do
-        if args[1]
-            pass = args[1]
-        else
-            rc = helper.password(options)
-            if rc.first == 0
-                pass = rc[1]
-            else
-                exit_with_code *rc
-            end
-        end
-
-        driver = options[:driver] || OpenNebula::User::CORE_AUTH
-
-        helper.create_resource(options) do |user|
-            user.allocate(args[0], pass, driver)
-        end
-    end
-
-    update_desc = <<-EOT.unindent
-        Update the template contents. If a path is not provided the editor will
-        be launched to modify the current content.
-    EOT
-
-    command :update, update_desc, :userid, [:file, nil],
-    :options=>OpenNebulaHelper::APPEND do
-        helper.perform_action(args[0],options,"modified") do |obj|
-            if options[:append]
-                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
-            else
-                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
-            end
-
-            helper.set_client(options)
-            obj = helper.retrieve_resource(obj.id)
-
-            obj.update(str, options[:append])
-        end
-    end
-
-    quota_desc = <<-EOT.unindent
-        Set the quota limits for the user. If a path is not provided the editor
-        will be launched to modify the current quotas.
-    EOT
-
-    command :quota, quota_desc, :userid, [:file, nil] do
-        helper.perform_action(args[0], options, "modified") do |user|
-            rc = user.info
-
-            if OpenNebula.is_error?(rc)
-                puts rc.message
-                exit -1
-            end
-
-            str = OneQuotaHelper.set_quota(user, args[1])
-
-            helper.set_client(options)
-            user = helper.retrieve_resource(user.id)
-
-            rc  = user.set_quota(str)
-
-            if OpenNebula.is_error?(rc)
-                puts rc.message
-                exit -1
-            end
-        end
-    end
-
-    batchquota_desc = <<-EOT.unindent
-        Sets the quota limits in batch for various users. If a path is not
-        provided the editor will be launched to create new quotas.
-    EOT
-
-    command :batchquota, batchquota_desc, [:range, :userid_list],
-            [:file, nil] do
-        batch_str = OneQuotaHelper.get_batch_quota(args[1])
-
-        helper.perform_actions(args[0], options, "modified") do |user|
-            str = OneQuotaHelper.merge_quota(user, batch_str)
-
-            if OpenNebula.is_error?(str)
-                str
-            else
-                helper.set_client(options)
-                user = helper.retrieve_resource(user.id)
-
-                rc  = user.set_quota(str)
-                rc
-            end
-        end
-    end
-
-    defaultquota_desc = <<-EOT.unindent
-        Sets the default quota limits for the users. If a path is not provided
-        the editor will be launched to modify the current default quotas.
-    EOT
-
-    command :defaultquota, defaultquota_desc, [:file, nil] do
-        system = System.new(OneUserHelper.get_client(options))
-
-        default_quotas = system.get_user_quotas()
-
-        if OpenNebula.is_error?(default_quotas)
-            puts default_quotas.message
-            exit(-1)
-        end
-
-        str = OneQuotaHelper.set_quota(default_quotas, args[0], true)
-
-        system = System.new(OneUserHelper.get_client(options))
-        rc  = system.set_user_quotas(str)
-
-        if OpenNebula.is_error?(rc)
-            puts rc.message
-            exit(-1)
-        end
-
-        exit 0
-    end
-
-    umask_desc = <<-EOT.unindent
-        Changes the umask used to create the default permissions. In a similar
-        way to the Unix umask command, the expected value is a three-digit
-        base-8 number. Each digit is a mask that disables permissions for the
-        owner, group and other, respectively.
-
-        If mask is not given, or if it is an empty string, the umask will
-        be unset
-    EOT
-
-    command :umask, umask_desc, [:range, :userid_list], [:mask, nil] do
-        helper.perform_actions(args[0],options,
-                "umask changed") do |user|
-
-            rc = user.info
-
-            if OpenNebula.is_error?(rc)
-                puts rc.message
-                exit -1
-            end
-
-            user.delete_element('/USER/TEMPLATE/UMASK')
-
-            tmp_str = user.template_str
-
-            if !args[1].nil? && args[1] != ""
-                tmp_str << "\nUMASK = #{args[1]}"
-            end
-
-            user.update(tmp_str)
-        end
-    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
-    EOT
-
-    command :login, login_desc, :username, :options=>login_options do
-
-        options[:time] ||= 36000
-
-        helper.login(args[0], options)
-    end
-
-    key_desc = <<-EOT.unindent
-        Shows a public key from a private SSH key. Use it as password
-        for the SSH authentication mechanism.
-    EOT
-
-    command :key, key_desc, :options=>[KEY] do
-        require 'opennebula/ssh_auth'
-
-        options[:key] ||= ENV['HOME']+'/.ssh/id_rsa'
-
-        begin
-            sshauth = SshAuth.new(:private_key=>options[:key])
-        rescue Exception => e
-            exit_with_code -1, e.message
-        end
-
-        puts sshauth.password
-        exit_with_code 0
-    end
-
-
-    delete_desc = <<-EOT.unindent
-        Deletes the given User
-    EOT
-
-    command :delete, delete_desc, [:range, :userid_list] do
-        helper.perform_actions(args[0], options, "deleted") do |user|
-            user.delete
-        end
-    end
-
-    passwd_desc = <<-EOT.unindent
-        Changes the given User's password
-    EOT
-
-    command :passwd, passwd_desc, :userid, [:password, nil],
-            :options=>create_options do
-        if args[1]
-            pass = args[1]
-        else
-            rc = helper.password(options)
-            if rc.first == 0
-                pass = rc[1]
-            else
-                exit_with_code *rc
-            end
-        end
-
-        helper.perform_action(args[0],options,"Password changed") do |user|
-            user.passwd(pass)
-        end
-    end
-
-    chgrp_desc = <<-EOT.unindent
-        Changes the User's primary group
-    EOT
-
-    command :chgrp, chgrp_desc, [:range, :userid_list], :groupid do
-        helper.perform_actions(args[0],options,"Group changed") do |user|
-            user.chgrp(args[1].to_i)
-        end
-    end
-
-    addgroup_desc = <<-EOT.unindent
-        Adds the User to a secondary group
-    EOT
-
-    command :addgroup, addgroup_desc, [:range, :userid_list], :groupid do
-        gid = args[1]
-
-        helper.perform_actions(args[0],options,"group added") do |user|
-            user.addgroup( gid )
-        end
-    end
-
-    delgroup_desc = <<-EOT.unindent
-        Removes the User from a secondary group
-    EOT
-
-    command :delgroup, delgroup_desc, [:range, :userid_list], :groupid do
-        gid = args[1]
-
-        helper.perform_actions(args[0],options,"group deleted") do |user|
-            user.delgroup( gid )
-        end
-    end
-
-    chauth_desc = <<-EOT.unindent
-        Changes the User's auth driver and its password (optional)
-        Examples:
-          oneuser chauth my_user core
-          oneuser chauth my_user core new_password
-          oneuser chauth my_user core -r /tmp/mypass
-          oneuser chauth my_user --ssh --key /home/oneadmin/.ssh/id_rsa
-          oneuser chauth my_user --ssh -r /tmp/public_key
-          oneuser chauth my_user --x509 --cert /tmp/my_cert.pem
-    EOT
-
-    command :chauth, chauth_desc, :userid, [:auth, nil], [:password, nil],
-            :options=>create_options do
-        if options[:driver]
-            driver = options[:driver]
-        elsif args[1]
-            driver = args[1]
-        else
-            exit_with_code 0, "An Auth driver should be specified"
-        end
-
-        if args[2]
-            pass = args[2]
-        else
-            rc = helper.password(options)
-            if rc.first == 0
-                pass = rc[1]
-            else
-                pass = ""
-            end
-        end
-
-        helper.perform_action(args[0],
-                            options,
-                            "Auth driver and password changed") do |user|
-            user.chauth(driver, pass)
-        end
-    end
-
-    list_desc = <<-EOT.unindent
-        Lists Users in the pool
-    EOT
-
-    command :list, list_desc, :options=>list_options do
-        helper.list_pool(options)
-    end
-
-    show_desc = <<-EOT.unindent
-        Shows information for the given User
-    EOT
-
-    command :show, show_desc, [:userid, nil],
-            :options=>OpenNebulaHelper::XML do
-        user=args[0] || OpenNebula::User::SELF
-        helper.show_resource(user,options)
-    end
-
-    show_desc = <<-EOT.unindent
-        Encodes user and password to use it with ldap
-    EOT
-
-    command :encode, show_desc, :username, [:password, nil] do
-        ar=args.compact
-
-        if defined?(URI::Parser)
-            parser=URI::Parser.new
-        else
-            parser=URI
-        end
-
-        puts ar.map{|a| parser.escape(a) }.join(':')
-
-        0
-    end
-end