opennebula-cli 4.5.80.beta → 4.5.85.rc1

data/bin/oneacct

@@ -44,7 +44,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do
     end
 
     option AcctHelper::ACCT_OPTIONS + CommandParser::OPTIONS +
-        [OpenNebulaHelper::DESCRIBE, CLIHelper::LIST, CLIHelper::CSV] +
+        [OpenNebulaHelper::DESCRIBE, CLIHelper::LIST, CLIHelper::CSV_OPT] +
         OpenNebulaHelper::CLIENT_OPTIONS
 
     main do

data/bin/onegroup

@@ -79,17 +79,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         Examples:
 
-          - using a template description file:
-
-            onegroup create group_description.tmpl
-
-          - create a group with admin group, admin user and allow group users
-            to only create new templates and VMs, and group admins to manage
+          - create a group with admin user and allow group users
+            to only create new templates and VMs, and group admin to manage
             templates, vms, images and virtual networks
 
-            onegroup create --name groupA --admin_group admin_groupA 
+            onegroup create --name groupA
                             --admin_user admin_userA --admin_password somestr
-                            --resource TEMPLATE+VM 
+                            --resources TEMPLATE+VM
                             --admin_resources TEMPLATE+VM+IMAGE+NET
 
     EOT
@@ -110,12 +106,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             end
 
             admin_user=Hash.new
-            admin_user[:name]      = options[:admin_user]
-            admin_user[:password]  = options[:admin_password]
-            if options[:admin_driver]
-                admin_user[:auth_driver] = options[:admin_driver]
-            end
-            options[:user] = admin_user
+            admin_user[:name]       = options[:admin_user]
+            admin_user[:password]   = options[:admin_password]
+            admin_user[:auth_driver]= options[:admin_driver] if options[:admin_driver]
+            admin_user[:resources]  = options[:admin_resources] if options[:admin_resources]
+
+            options[:group_admin] = admin_user
         end
 
         if !options.empty?
@@ -142,7 +138,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
             obj.update(str, options[:append])
         end
-    end    
+    end
 
     delete_desc = <<-EOT.unindent
         Deletes the given Group
@@ -193,7 +189,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 exit -1
             end
         end
-    end  
+    end
 
     batchquota_desc = <<-EOT.unindent
         Sets the quota limits in batch for various groups. If a path is not
@@ -232,7 +228,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             exit(-1)
         end
 
-        str = OneQuotaHelper.set_quota(default_quotas, args[0])
+        str = OneQuotaHelper.set_quota(default_quotas, args[0], true)
 
         rc  = system.set_group_quotas(str)
 

data/bin/oneuser

@@ -265,7 +265,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             exit(-1)
         end
 
-        str = OneQuotaHelper.set_quota(default_quotas, args[0])
+        str = OneQuotaHelper.set_quota(default_quotas, args[0], true)
 
         rc  = system.set_user_quotas(str)
 

data/bin/onevm

@@ -91,6 +91,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Recover a VM by failing the pending action"
     }
 
+    CLONETEMPLATE={
+        :name => "clonetemplate",
+        :short => "-c",
+        :large => "--clonetemplate",
+        :description => "Clone original VM Template and replace disk with saved one"
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -297,7 +304,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"disk-snapshot", disk_snapshot_desc, :vmid, :diskid, :img_name,
-            :options=>[TYPE, OneVMHelper::LIVE] do
+            :options=>[TYPE, OneVMHelper::LIVE, CLONETEMPLATE] do
         disk_id    = args[1].to_i
         image_name = args[2]
         image_type = options[:type] || ""
@@ -307,7 +314,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         helper.perform_action(args[0],options,verbose) do |vm|
             res = vm.disk_snapshot(disk_id, image_name, image_type,
-                options[:live]==true)
+                options[:live]==true, options[:clonetemplate]==true)
 
             if !OpenNebula.is_error?(res)
                 puts "Image ID: #{res}"
@@ -417,7 +424,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: PENDING
     EOT
 
-    command :deploy, deploy_desc, [:range,:vmid_list], :hostid, [:datastoreid,nil], 
+    command :deploy, deploy_desc, [:range,:vmid_list], :hostid, [:datastoreid,nil],
             :options=>[ENFORCE] do
         host_id = args[1]
         verbose = "deploying in host #{host_id}"

data/lib/cli_helper.rb

@@ -25,7 +25,7 @@ module CLIHelper
         :description => "Selects columns to display with list command"
     }
 
-    CSV = {
+    CSV_OPT = {
         :name  => "csv",
         :large => "--csv",
         :description => "Write table in csv format"
@@ -64,7 +64,7 @@ module CLIHelper
     }
 
     #OPTIONS = [LIST, ORDER, FILTER, HEADER, DELAY]
-    OPTIONS = [LIST, DELAY, FILTER, CSV]
+    OPTIONS = [LIST, DELAY, FILTER, CSV_OPT]
 
     # Sets bold font
     def CLIHelper.scr_bold
@@ -268,10 +268,8 @@ module CLIHelper
 
             begin
                 if options[:csv]
-                    CSV($stdout, :write_headers => true,
-                                 :headers => @default_columns) do |csv|
-                        res_data.each {|l| csv << l }
-                    end
+                    puts CSV.generate_line(@default_columns)
+                    res_data.each {|l| puts CSV.generate_line(l) }
                 else
                     res_data.each{|l|
                         puts (0..ncolumns-1).collect{ |i|

data/lib/one_helper.rb

@@ -137,14 +137,6 @@ EOT
                 'Name for the new group',
             :format => String
         },
-        {
-            :name   => 'admin_group',
-            :large  => '--admin_group name',
-            :short => "-a",
-            :description =>
-                'Creates an admin group with name',
-            :format => String
-        },
         {
             :name   => 'admin_user',
             :large  => '--admin_user name',
@@ -155,7 +147,7 @@ EOT
         },
         {
             :name   => 'admin_password',
-            :large  => '--admin_password password',
+            :large  => '--admin_password pass',
             :short => "-p",
             :description =>
                 'Password for the admin user of the group',
@@ -163,7 +155,7 @@ EOT
         },
         {
             :name   => 'admin_driver',
-            :large  => '--admin_driver auth_driver',
+            :large  => '--admin_driver driver',
             :short => "-d",
             :description =>
                 'Auth driver for the admin user of the group',
@@ -171,20 +163,20 @@ EOT
         },
         {
             :name   => 'resources',
-            :large  => '--resources resources_str',
+            :large  => '--resources res_str',
             :short => "-r",
             :description =>
-                'Which resources can be created by group users "\
-                "(VM+NET+IMAGE+TEMPLATE by default)',
+                "Which resources can be created by group users "<<
+                "(VM+NET+IMAGE+TEMPLATE by default)",
             :format => String
         },
         {
             :name   => 'admin_resources',
-            :large  => '--admin_resources resources_str',
+            :large  => '--admin_resources res_str',
             :short => "-o",
             :description =>
-                'Which resources can be created by group users "\
-                "(VM+NET+IMAGE+TEMPLATE by default)',
+                "Which resources can be created by the admin user "<<
+                "(VM+NET+IMAGE+TEMPLATE by default)",
             :format => String
         }
     ]
@@ -482,9 +474,10 @@ EOT
                     array=pool.get_hash
                     return -1, array.message if OpenNebula.is_error?(array)
 
-                    if options[:ids]
-                        rname=self.class.rname
-                        array["#{rname}_POOL"][rname].reject! do |element|
+                    rname=self.class.rname
+                    elements=array["#{rname}_POOL"][rname]
+                    if options[:ids] && elements
+                        elements.reject! do |element|
                             !options[:ids].include?(element['ID'].to_i)
                         end
                     end

data/lib/one_helper/onegroup_helper.rb

@@ -50,17 +50,14 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
     def create_complete_resource(group_hash)
         group = factory
-        exit_code , msg = group.create(group_hash)
+        rc = group.create(group_hash)
 
-        puts msg if msg && !msg.empty?
-
-        if (exit_code.class==Fixnum and exit_code < 0) or OpenNebula.is_error?(exit_code)
-            puts exit_code.message if OpenNebula.is_error?(exit_code) && exit_code.message
-            return -1
-        else
-            puts "ID: #{group.id}"
-            return 0
+        if OpenNebula.is_error?(rc)
+            return -1, rc.message
         end
+
+        puts "ID: #{group.id}"
+        return 0
     end
 
     def format_pool(options)

data/lib/one_helper/onequota_helper.rb

@@ -46,9 +46,12 @@ class OneQuotaHelper
         #    ID     = <ID of the image>
         #    RVMS   = <Max. number of VMs using the image>
         #  ]
+    EOT
+
+    HELP_QUOTA_FOOTER = <<-EOT.unindent
         #
         #  In any quota:
-        #    -1 means use the default limit ('defaultquota' command)
+        #    -1 means use the default limit (set with the 'defaultquota' command)
         #    0 means unlimited.
         #
         #  The usage counters "*_USED" are shown for information
@@ -56,12 +59,23 @@ class OneQuotaHelper
         #-----------------------------------------------------------------------
     EOT
 
+    HELP_DEFAULT_QUOTA_FOOTER = <<-EOT.unindent
+        #
+        #  In any quota:
+        #    0 means unlimited.
+        #
+        #  The usage counters "*_USED" will always be 0 for the default
+        #  quotas, and can be ignored.
+        #-----------------------------------------------------------------------
+    EOT
+
     #  Edits the quota template of a resource
     #  @param [XMLElement] resource to get the current info from
     #  @param [String] path to the new contents. If nil a editor will be 
     #         used
+    #  @param [True|False] is_default To change the help text
     #  @return [String] contents of the new quotas
-    def self.set_quota(resource, path)
+    def self.set_quota(resource, path, is_default=false)
         str = ""
 
         if path.nil?
@@ -71,6 +85,13 @@ class OneQuotaHelper
             path = tmp.path
 
             tmp << HELP_QUOTA
+
+            if (is_default)
+                tmp << HELP_DEFAULT_QUOTA_FOOTER
+            else
+                tmp << HELP_QUOTA_FOOTER
+            end
+
             tmp << resource.template_like_str("DATASTORE_QUOTA") << "\n"
             tmp << resource.template_like_str("VM_QUOTA") << "\n"
             tmp << resource.template_like_str("NETWORK_QUOTA") << "\n"

metadata

@@ -1,103 +1,107 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.5.80.beta
+  version: 4.5.85.rc1
+  prerelease: 7
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-11 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.5.80.beta
+        version: 4.5.85.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.80.beta
+        version: 4.5.85.rc1
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
-- oneacct
 - oneacl
-- onecluster
-- onedatastore
-- oneflow
-- oneflow-template
-- onegroup
 - onehost
+- oneflow-template
+- onevnet
 - oneimage
+- onedatastore
+- onevm
+- onegroup
+- onecluster
 - onetemplate
+- oneflow
 - oneuser
-- onevm
-- onevnet
 - onezone
+- oneacct
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- NOTICE
-- bin/oneacct
 - bin/oneacl
-- bin/onecluster
-- bin/onedatastore
-- bin/oneflow
-- bin/oneflow-template
-- bin/onegroup
 - bin/onehost
+- bin/oneflow-template
+- bin/onevnet
 - bin/oneimage
+- bin/onedatastore
+- bin/onevm
+- bin/onegroup
+- bin/onecluster
 - bin/onetemplate
+- bin/oneflow
 - bin/oneuser
-- bin/onevm
-- bin/onevnet
 - bin/onezone
-- lib/cli_helper.rb
-- lib/command_parser.rb
+- bin/oneacct
 - 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/command_parser.rb
+- lib/cli_helper.rb
 - lib/one_helper/onequota_helper.rb
 - lib/one_helper/onetemplate_helper.rb
-- lib/one_helper/oneuser_helper.rb
-- lib/one_helper/onevm_helper.rb
-- lib/one_helper/onevnet_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
 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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OpenNebula Command Line Interface
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0d0a7a6d4a5861896dcea19d5bd0901864e93cf8
-  data.tar.gz: 3348c3fbf038afce1e154ed5d17cf94819c663a1
-SHA512:
-  metadata.gz: 30d8c96ff0feaffd28f8c13a180d4118e40e12c95f994d4336d72efff7a6fb2f58cd69aa28bb9955c17bba52d51e8c2a95386d33f2777e5997151279c2c94c89
-  data.tar.gz: 3f283c2538ee84ff6f5d4341f8b9f0ff854731de9e358489f73a9be7ba7a6a69dc7573b3340101ea12ae4ed3810c21944d4510a0863db77a1ad0193a89daf3c5