opennebula-cli 3.9.0.beta → 3.9.80.beta

data/bin/onevnet

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #

data/lib/cli_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -252,6 +252,9 @@ module CLIHelper
             if @columns[field]
                 minus=( @columns[field][:left] ? "-" : "" )
                 size=@columns[field][:size]
+                if @columns[field][:donottruncate]
+                    return "%#{minus}#{size}s" % [ data.to_s ]
+                end
                 return "%#{minus}#{size}.#{size}s" % [ data.to_s ]
             else
                 exit -1, "Column #{field} not defined."

data/lib/command_parser.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -635,14 +635,20 @@ module CommandParser
         end
 
         def print_option(o)
-            opt_format = "#{' '*5}%-25s %s"
+            opt_format = "#{' '*5}%-25s"
 
             str = ""
             str << o[:short].split(' ').first << ', ' if o[:short]
             str << o[:large]
 
-            printf opt_format, str, o[:description]
-            puts
+            params=sprintf(opt_format, str)
+
+            first_line=80-params.length
+
+            description=word_wrap(80-32, o[:description], first_line).
+                join(("\n"+" "*31))
+
+            puts "#{params} #{description}"
         end
 
         def print_commands
@@ -707,6 +713,30 @@ module CommandParser
             }
         end
 
+        def word_wrap(size, text, first_size=nil)
+            output=[]
+            line=""
+            if first_size
+                line_size=first_size
+            else
+                line_size=size
+            end
+
+            text.scan(/[^\s]+/) do |word|
+                if line.length+word.length+1<=line_size
+                    line+=" #{word}"
+                else
+                    output<<line
+                    line=word
+                    line_size=size
+                end
+            end
+
+            output<<line
+            output[0].strip!
+            output
+        end
+
         ########################################################################
         # Default Formatters for arguments
         ########################################################################

data/lib/one_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -22,7 +22,7 @@ include OpenNebula
 module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
-Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)
+Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs
 
 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
@@ -103,6 +103,7 @@ EOT
         }
     ]
 
+    #NOTE: Other options defined using this array, add new options at the end
     TEMPLATE_OPTIONS=[
         {
             :name   => 'cpu',
@@ -152,16 +153,16 @@ EOT
         },
         {
             :name   => 'disk',
-            :large  => '--disk disk0,disk1',
-            :description => "Disks to attach. To use a disk owned by other\n"<<
-                            " "*31<<"user use user[disk]",
+            :large  => '--disk image0,image1',
+            :description => "Disks to attach. To use an image owned by"<<
+                            " other user use user[disk]",
             :format => Array
         },
         {
-            :name   => 'network',
-            :large  => '--network network0,network1',
-            :description => "Networks to attach. To use a network owned by\n"<<
-                            " "*31<<"other user use user[network]",
+            :name   => 'nic',
+            :large  => '--nic network0,network1',
+            :description => "Networks to attach. To use a network owned by"<<
+                            " other user use user[network]",
             :format => Array
         },
         {
@@ -212,6 +213,8 @@ EOT
 
     TEMPLATE_OPTIONS_VM=[TEMPLATE_NAME_VM]+TEMPLATE_OPTIONS+[DRY]
 
+    CAPACITY_OPTIONS_VM=[TEMPLATE_OPTIONS[0],TEMPLATE_OPTIONS[1],TEMPLATE_OPTIONS[3]]
+
     OPTIONS = XML, NUMERIC, KILOBYTES
 
     class OneHelper
@@ -315,7 +318,15 @@ EOT
                         pool_to_array(pool)
                     }
                 else
-                    table.show(pool_to_array(pool), options)
+                    array=pool_to_array(pool)
+
+                    if options[:ids]
+                        array=array.select do |element|
+                            options[:ids].include? element['ID'].to_i
+                        end
+                    end
+
+                    table.show(array, options)
                 end
 
                 return 0
@@ -331,7 +342,7 @@ EOT
             if options[:xml]
                 return 0, resource.to_xml(true)
             else
-                format_resource(resource)
+                format_resource(resource, options)
                 return 0
             end
         end
@@ -569,13 +580,19 @@ EOT
         end
     end
 
-    def OpenNebulaHelper.time_to_str(time)
+    def OpenNebulaHelper.time_to_str(time, print_seconds=true)
         value=time.to_i
         if value==0
             value='-'
         else
-            value=Time.at(value).strftime("%m/%d %H:%M:%S")
+            if print_seconds
+                value=Time.at(value).strftime("%m/%d %H:%M:%S")
+            else
+                value=Time.at(value).strftime("%m/%d %H:%M")
+            end
         end
+
+        return value
     end
 
     def OpenNebulaHelper.period_to_str(time, print_seconds=true)
@@ -623,7 +640,7 @@ EOT
         end
     end
 
-    def OpenNebulaHelper.update_template(id, resource, path=nil)
+    def OpenNebulaHelper.update_template(id, resource, path=nil, xpath='TEMPLATE')
         unless path
             require 'tempfile'
 
@@ -637,7 +654,7 @@ EOT
                 exit -1
             end
 
-            tmp << resource.template_str
+            tmp << resource.template_like_str(xpath)
             tmp.flush
 
             editor_path = ENV["EDITOR"] ? ENV["EDITOR"] : EDITOR_PATH

data/lib/one_helper/oneacct_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'optparse/time'
 
 class AcctHelper < OpenNebulaHelper::OneHelper
     START_TIME = {
@@ -22,7 +23,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :short  => "-s TIME",
         :large  => "--start TIME" ,
         :description => "Start date and time to take into account",
-        :format => String # TODO Time
+        :format => Time
     }
 
     END_TIME = {
@@ -30,7 +31,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :short  => "-e TIME",
         :large  => "--end TIME" ,
         :description => "End date and time",
-        :format => String # TODO Time
+        :format => Time
     }
 
     USERFILTER = {
@@ -144,7 +145,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         default :VID, :HOSTNAME, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX
     end
 
-    def self.print_start_enc_time_header(start_time, end_time)
+    def self.print_start_end_time_header(start_time, end_time)
         print "Showing active history records from "
 
         CLIHelper.scr_bold

data/lib/one_helper/oneacl_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #

data/lib/one_helper/onecluster_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -95,13 +95,14 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
         OpenNebula::ClusterPool.new(@client)
     end
 
-    def format_resource(cluster)
-        str="%-15s: %-20s"
+    def format_resource(cluster, options = {})
+        str="%-18s: %-20s"
         str_h1="%-80s"
 
         CLIHelper.print_header(str_h1 % "CLUSTER #{cluster['ID']} INFORMATION")
         puts str % ["ID",   cluster.id.to_s]
         puts str % ["NAME", cluster.name]
+        puts str % ["SYSTEM DS", cluster['SYSTEM_DS']]
         puts
 
         CLIHelper.print_header(str_h1 % "CLUSTER TEMPLATE", false)

data/lib/one_helper/onedatastore_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -95,7 +95,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         OpenNebula::DatastorePool.new(@client)
     end
 
-    def format_resource(datastore)
+    def format_resource(datastore, options = {})
         str="%-15s: %-20s"
         str_h1="%-80s"
 
@@ -110,6 +110,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         puts str % ["DS_MAD",   datastore['DS_MAD']]
         puts str % ["TM_MAD",   datastore['TM_MAD']]
         puts str % ["BASE PATH",datastore['BASE_PATH']]
+        puts str % ["DISK_TYPE",Image::DISK_TYPES[datastore['DISK_TYPE'].to_i]]
         puts
 
         CLIHelper.print_header(str_h1 % "PERMISSIONS",false)

data/lib/one_helper/onegroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -48,12 +48,8 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
-        system = System.new(@client)
-        default_quotas = system.get_group_quotas()
-
-        if OpenNebula::is_error?(default_quotas)
-            raise "Error retrieving the default group quotas: #{default_quotas.message}"
-        end
+        prefix = '/GROUP_POOL/DEFAULT_GROUP_QUOTAS/'
+        group_pool = @group_pool
 
         table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, "ONE identifier for the Group", :size=>4 do |d|
@@ -77,7 +73,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     limit = d['VM_QUOTA']['VM']["VMS"]
 
                     if limit == "-1"
-                        limit = default_quotas['VM_QUOTA/VM/VMS']
+                        limit = group_pool["#{prefix}VM_QUOTA/VM/VMS"]
                         limit = "0" if limit.nil? || limit == ""
                     end
 
@@ -92,7 +88,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     limit = d['VM_QUOTA']['VM']["MEMORY"]
 
                     if limit == "-1"
-                        limit = default_quotas['VM_QUOTA/VM/MEMORY']
+                        limit = group_pool["#{prefix}VM_QUOTA/VM/MEMORY"]
                         limit = "0" if limit.nil? || limit == ""
                     end
 
@@ -109,7 +105,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                     limit = d['VM_QUOTA']['VM']["CPU"]
 
                     if limit == "-1"
-                        limit = default_quotas['VM_QUOTA/VM/CPU']
+                        limit = group_pool["#{prefix}VM_QUOTA/VM/CPU"]
                         limit = "0" if limit.nil? || limit == ""
                     end
 
@@ -138,16 +134,12 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
     def factory_pool(user_flag=-2)
         #TBD OpenNebula::UserPool.new(@client, user_flag)
-        OpenNebula::GroupPool.new(@client)
+        @group_pool = OpenNebula::GroupPool.new(@client)
+        return @group_pool
     end
 
-    def format_resource(group)
+    def format_resource(group, options = {})
         system = System.new(@client)
-        default_quotas = system.get_group_quotas()
-
-        if OpenNebula::is_error?(default_quotas)
-            raise "Error retrieving the default group quotas: #{default_quotas.message}"
-        end
 
         str="%-15s: %-20s"
         str_h1="%-80s"
@@ -165,6 +157,12 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
 
         group_hash = group.to_hash
 
+        default_quotas = nil
+
+        group.each('/GROUP/DEFAULT_GROUP_QUOTAS') { |elem|
+            default_quotas = elem
+        }
+
         helper = OneQuotaHelper.new
         helper.format_quota(group_hash['GROUP'], default_quotas)
     end

data/lib/one_helper/onehost_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -162,7 +162,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         OpenNebula::HostPool.new(@client)
     end
 
-    def format_resource(host)
+    def format_resource(host, options = {})
         str    = "%-22s: %-20s"
         str_h1 = "%-80s"
 

data/lib/one_helper/oneimage_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # 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    #
@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'one_helper/onevm_helper'
 
 class OneImageHelper < OpenNebulaHelper::OneHelper
     TEMPLATE_OPTIONS=[
@@ -101,14 +102,14 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         {
             :name => "disk_type",
             :large => "--disk_type disk_type",
-            :description => "Type of the image (BLOCK, CDROM or FILE)",
+            :description => "Type of the image (BLOCK, CDROM, RBD or FILE)",
             :format => String,
             :proc => lambda do |o, options|
                 type=o.strip.upcase
-                if %w{BLOCK CDROM FILE}.include? type
+                if %w{BLOCK CDROM FILE RBD}.include? type
                     [0, type]
                 else
-                    [-1, "Disk type must be BLOCK, CDROM or FILE"]
+                    [-1, "Disk type must be BLOCK, CDROM, RBD or FILE"]
                 end
             end
         },
@@ -261,7 +262,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         OpenNebula::ImagePool.new(@client, user_flag)
     end
 
-    def format_resource(image)
+    def format_resource(image, options = {})
         str="%-15s: %-20s"
         str_h1="%-80s"
 
@@ -298,6 +299,19 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
 
         CLIHelper.print_header(str_h1 % "IMAGE TEMPLATE",false)
         puts image.template_str
+
+        puts
+        CLIHelper.print_header("VIRTUAL MACHINES", false)
+        puts
+
+        vms=image.retrieve_elements("VMS/ID")
+
+        if vms
+            vms.map!{|e| e.to_i }
+            onevm_helper=OneVMHelper.new
+            onevm_helper.client=@client
+            onevm_helper.list_pool({:ids=>vms}, false)
+        end
     end
 
     def self.create_image_variables(options, name)
@@ -323,9 +337,12 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         end
 
         template=create_image_variables(
-            options, template_options-[:persistent, :dry])
+            options, template_options-[:persistent, :dry, :prefix])
 
         template<<"PERSISTENT=YES\n" if options[:persistent]
+        if options[:prefix]
+            template<<"DEV_PREFIX=\"#{options[:prefix]}\"\n"
+        end
 
         [0, template]
     end