opennebula-cli 3.8.0 → 3.9.0.beta

data/bin/oneacct

@@ -37,11 +37,17 @@ cmd = CommandParser::CmdParser.new(ARGV) do
     description ""
     version OpenNebulaHelper::ONE_VERSION
 
+    helper=OpenNebulaHelper::OneHelper.new
 
-    option AcctHelper::ACCT_OPTIONS + CommandParser::OPTIONS
+    before_proc do
+        helper.set_client(options)
+    end
+
+    option AcctHelper::ACCT_OPTIONS + CommandParser::OPTIONS +
+        OpenNebulaHelper::CLIENT_OPTIONS
 
     main do
-        filter_flag = (options[:user] || VirtualMachinePool::INFO_ALL)
+        filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
         start_time  = options[:start] ? options[:start].to_i : -1
         end_time    = options[:end] ? options[:end].to_i : -1
 
@@ -53,9 +59,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do
             :xpath      => options[:xpath]
         }
 
-        client = OpenNebula::Client.new
-        pool   = OpenNebula::VirtualMachinePool.new(client)
-
+        pool   = OpenNebula::VirtualMachinePool.new(helper.client)
 
         if options[:json] || options[:xml]
             xml_str = pool.accounting_xml(filter_flag, common_opts)
@@ -85,6 +89,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do
                 exit -1
             end
 
+
             if ( start_time != -1 or end_time != -1 )
                 AcctHelper.print_start_end_time_header(start_time, end_time)
             end

data/bin/oneacl

@@ -36,10 +36,14 @@ cmd = CommandParser::CmdParser.new(ARGV) do
     
     helper = OneAclHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     ########################################################################
     # Formatters for arguments

data/bin/onecluster

@@ -36,10 +36,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneClusterHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML

data/bin/onedatastore

@@ -37,10 +37,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneDatastoreHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML

data/bin/onegroup

@@ -36,10 +36,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneGroupHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML
@@ -105,6 +109,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :quota, quota_desc, :groupid, [:file, nil] do
         helper.perform_action(args[0], options, "modified") do |group|
+            rc = group.info
+
+            if OpenNebula.is_error?(rc)
+                puts rc.message
+                exit -1
+            end
+
             str = OneQuotaHelper.set_quota(group, args[1])
             rc  = group.set_quota(str)
 
@@ -134,4 +145,32 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             end
         end
     end
+
+
+    defaultquota_desc = <<-EOT.unindent
+        Sets the default quota limits for the groups. 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(OneGroupHelper.get_client(options))
+
+        default_quotas = system.get_group_quotas()
+
+        if OpenNebula.is_error?(default_quotas)
+            puts default_quotas.message
+            exit(-1)
+        end
+
+        str = OneQuotaHelper.set_quota(default_quotas, args[0])
+
+        rc  = system.set_group_quotas(str)
+
+        if OpenNebula.is_error?(rc)
+            puts rc.message
+            exit(-1)
+        end
+
+        exit 0
+    end
 end

data/bin/onehost

@@ -37,10 +37,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneHostHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     IM = {
     :name   => "im",

data/bin/oneimage

@@ -37,10 +37,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneImageHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML
@@ -72,6 +76,15 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.filterflag_to_i(arg)
     end
 
+    format(:type, "Image type: #{Image::IMAGE_TYPES.join(", ")}") do |arg|
+        type=arg.strip.upcase
+        if Image::IMAGE_TYPES.include? type
+            [0, type]
+        else
+            [1, "Image type not supported. Must be #{Image::IMAGE_TYPES.join(", ")}."]
+        end
+    end
+
     ########################################################################
     # Commands
     ########################################################################
@@ -103,7 +116,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     command :create, create_desc, [:file, nil], :options=>CREATE_OPTIONS +
             OneImageHelper::TEMPLATE_OPTIONS do
 
-        if options[:datastore].nil?
+        if options[:datastore].nil? && !options[:dry]
             STDERR.puts "Datastore to save the image is mandatory: "
             STDERR.puts "\t -d datastore_id"
             exit -1
@@ -130,6 +143,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     template = res.last
                 end
 
+                if options[:dry]
+                    puts template
+                    exit 0
+                end
+
                 image.allocate(template, options[:datastore])
             rescue => e
                 STDERR.puts e.messsage
@@ -150,6 +168,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 puts "ID: #{res}"
             else
                 puts res.message
+                exit -1
             end
         end
     end
@@ -285,6 +304,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    rename_desc = <<-EOT.unindent
+        Renames the Image
+    EOT
+
+    command :rename, rename_desc, :imageid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
+
     list_desc = <<-EOT.unindent
         Lists Images in the pool
     EOT

data/bin/onetemplate

@@ -36,10 +36,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneTemplateHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML
@@ -93,12 +97,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
           - using two disks:
 
-            onevm create --name "test vm" --memory 128 --cpu 1 --disk arch,data
+            onetempate create --name "test vm" --memory 128 --cpu 1 --disk arch,data
 
     EOT
 
     command :create, create_desc, [:file, nil], :options =>
-            [OneTemplateHelper::VM_NAME]+OpenNebulaHelper::TEMPLATE_OPTIONS do
+            [OneTemplateHelper::VM_NAME]+OpenNebulaHelper::TEMPLATE_OPTIONS+
+            [OpenNebulaHelper::DRY] do
 
         if args[0] && OpenNebulaHelper.create_template_options_used?(options)
             STDERR.puts "You can not use both template file and template"<<
@@ -121,7 +126,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     template = res.last
                 end
 
-                tmpl.allocate(template)
+                if options[:dry]
+                    puts template
+                    exit 0
+                else
+                    tmpl.allocate(template)
+                end
             rescue => e
                 STDERR.puts e.messsage
                 exit -1
@@ -255,6 +265,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists Templates in the pool
     EOT
 
+    rename_desc = <<-EOT.unindent
+        Renames the Template
+    EOT
+
+    command :rename, rename_desc, :templateid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
+
     command :list, list_desc, [:filterflag, nil], :options=>list_options do
         helper.list_pool(options, false, args[0])
     end

data/bin/oneuser

@@ -37,10 +37,16 @@ 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)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML
@@ -57,7 +63,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     SHA1={
         :name => "sha1",
         :large => "--sha1",
-        :description => "The password will be hashed using the sha1 algorithm"
+        :description => "The password will be hashed using the sha1\n"<<
+                        " "*31<<"algorithm"
     }
 
     SSH={
@@ -135,12 +142,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     set :format, :userid, OneUserHelper.to_id_desc do |arg|
-        helper = OneUserHelper.new
         helper.to_id(arg)
     end
 
     set :format, :userid_list, OneUserHelper.list_to_id_desc do |arg|
-        helper = OneUserHelper.new
         helper.list_to_id(arg)
     end
 
@@ -164,8 +169,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :create, create_desc, :username, [:password, nil],
             :options=>create_options do
-        helper = OneUserHelper.new
-
         if args[1]
             pass = args[1]
         else
@@ -190,8 +193,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :userid, [:file, nil] do
-        helper = OneUserHelper.new
-
         helper.perform_action(args[0],options,"modified") do |user|
             str = OpenNebulaHelper.update_template(args[0], user, args[1])
             user.update(str)
@@ -204,9 +205,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :quota, quota_desc, :userid, [:file, nil] do
-        helper = OneUserHelper.new
-
         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])
             rc  = user.set_quota(str)
 
@@ -214,7 +220,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 puts rc.message
                 exit -1
             end
-
         end
     end
 
@@ -224,8 +229,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :batchquota, batchquota_desc, [:range, :userid_list], [:file, nil] do
-        helper = OneUserHelper.new
-
         batch_str = OneQuotaHelper.get_batch_quota(args[1])
 
         helper.perform_actions(args[0], options, "modified") do |user|
@@ -240,6 +243,33 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         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])
+
+        rc  = system.set_user_quotas(str)
+
+        if OpenNebula.is_error?(rc)
+            puts rc.message
+            exit(-1)
+        end
+
+        exit 0
+    end
+
     login_desc = <<-EOT.unindent
         Creates the Login token for authentication
         Examples:
@@ -282,7 +312,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :userid_list] do
-        helper = OneUserHelper.new
         helper.perform_actions(args[0], options, "deleted") do |user|
             user.delete
         end
@@ -294,8 +323,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :passwd, passwd_desc, :userid, [:password, nil],
             :options=>create_options do
-        helper = OneUserHelper.new
-
         if args[1]
             pass = args[1]
         else
@@ -317,7 +344,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chgrp, chgrp_desc, [:range, :userid_list], :groupid do
-        helper = OneUserHelper.new
         helper.perform_actions(args[0],options,"Group changed") do |user|
             user.chgrp(args[1].to_i)
         end
@@ -344,8 +370,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             exit_with_code 0, "An Auth driver should be specified"
         end
 
-        helper = OneUserHelper.new
-
         if args[2]
             pass = args[2]
         else
@@ -369,7 +393,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :list, list_desc, :options=>list_options do
-        helper = OneUserHelper.new
         helper.list_pool(options)
     end
 
@@ -380,7 +403,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     command :show, show_desc, [:userid, nil],
             :options=>OpenNebulaHelper::XML do
         user=args[0] || OpenNebula::User::SELF
-        helper = OneUserHelper.new
         helper.show_resource(user,options)
     end
 

data/bin/onevm

@@ -36,6 +36,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneVMHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
 
     TYPE={
         :name => "type",
@@ -47,16 +50,23 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     TARGET={
         :name => "target",
-        :short => "-t type",
-        :large => "--target type",
+        :short => "-t target",
+        :large => "--target target",
         :format => String,
         :description => "Device where the image will be attached"
     }
 
+    ENFORCE={
+        :name  => "enforce",
+        :short => "-e",
+        :large => "--enforce",
+        :description => "Enforce that the host capacity is not exceeded"
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     ########################################################################
     # Formatters for arguments
@@ -139,11 +149,17 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
                 template = res.last
             end
+
         rescue Exception => e
             STDERR.puts "Error reading template."
             next -1
         end
 
+        if options[:dry]
+            puts template
+            exit 0
+        end
+
         number.times do
             exit_code = helper.create_resource(options) do |vm|
                 error = vm.allocate(template)
@@ -278,12 +294,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: PENDING
     EOT
 
-    command :deploy, deploy_desc, [:range,:vmid_list], :hostid do
+    command :deploy, deploy_desc, [:range,:vmid_list], :hostid, :options=>[ENFORCE] do
         host_id = args[1]
         verbose = "deploying in host #{host_id}"
 
         helper.perform_actions(args[0],options,verbose) do |vm|
-            vm.deploy(host_id)
+            if !options[:enforce].nil?
+                vm.deploy(host_id, options[:enforce])
+            else
+                vm.deploy(host_id)
+            end
         end
     end
 
@@ -293,12 +313,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: RUNNING
     EOT
 
-    command :livemigrate, livemigrate_desc, [:range,:vmid_list], :hostid do
+    command :livemigrate, livemigrate_desc, [:range,:vmid_list], :hostid, :options=>[ENFORCE] do
         host_id = args[1]
         verbose = "live migrating to #{host_id}"
 
         helper.perform_actions(args[0],options,verbose) do |vm|
-            vm.live_migrate(host_id)
+            if !options[:enforce].nil?
+                vm.live_migrate(host_id, options[:enforce])
+            else
+                vm.live_migrate(host_id)
+            end
         end
     end
 
@@ -308,12 +332,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: RUNNING
     EOT
 
-    command :migrate, migrate_desc, [:range,:vmid_list], :hostid do
+    command :migrate, migrate_desc, [:range,:vmid_list], :hostid, :options=>[ENFORCE] do
         host_id = args[1]
         verbose = "migrating to #{host_id}"
 
         helper.perform_actions(args[0],options,verbose) do |vm|
-            vm.migrate(host_id)
+            if !options[:enforce].nil?
+                vm.migrate(host_id, options[:enforce])
+            else
+                vm.migrate(host_id)
+            end
         end
     end
 
@@ -506,6 +534,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists VMs in the pool
     EOT
 
+    rename_desc = <<-EOT.unindent
+        Renames the VM
+    EOT
+
+    command :rename, rename_desc, :vmid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
+
     command :list, list_desc, [:filterflag, nil],
             :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS+
             [OpenNebulaHelper::DESCRIBE] do

data/bin/onevnet

@@ -37,10 +37,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     helper = OneVNetHelper.new
 
+    before_proc do
+        helper.set_client(options)
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
 
     CREATE_OPTIONS = [OneClusterHelper::CLUSTER]
 
@@ -224,4 +228,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             vnet.update(str)
         end
     end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Virtual Network
+    EOT
+
+    command :rename, rename_desc, :vnetid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
 end