opennebula-cli 4.4.0 → 4.5.80.beta

data/lib/cli_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #
@@ -14,6 +14,8 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+require 'csv'
+
 module CLIHelper
     LIST = {
         :name  => "list",
@@ -23,6 +25,12 @@ module CLIHelper
         :description => "Selects columns to display with list command"
     }
 
+    CSV = {
+        :name  => "csv",
+        :large => "--csv",
+        :description => "Write table in csv format"
+    }
+
     #ORDER = {
     #    :name  => "order",
     #    :short => "-o x,y,z",
@@ -56,7 +64,7 @@ module CLIHelper
     }
 
     #OPTIONS = [LIST, ORDER, FILTER, HEADER, DELAY]
-    OPTIONS = [LIST, DELAY, FILTER]
+    OPTIONS = [LIST, DELAY, FILTER, CSV]
 
     # Sets bold font
     def CLIHelper.scr_bold
@@ -126,9 +134,36 @@ module CLIHelper
         puts
     end
 
+    module HashWithSearch
+        def dsearch(path)
+            stems=path.split('/')
+            hash=self
+
+            stems.delete_if {|s| s.nil? || s.empty? }
+
+            stems.each do |stem|
+                if Hash===hash
+                    if hash[stem]
+                        hash=hash[stem]
+                    else
+                        hash=nil
+                        break
+                    end
+                else
+                    hash=nil
+                    break
+                end
+            end
+
+            hash
+        end
+    end
+
     class ShowTable
         require 'yaml'
 
+        attr_reader :default_columns
+
         def initialize(conf=nil, ext=nil, &block)
             @columns = Hash.new
             @default_columns = Array.new
@@ -168,7 +203,23 @@ module CLIHelper
 
         def show(data, options={})
             update_columns(options)
-            print_table(data, options)
+
+            if Hash===data
+                @data=data
+                @data.extend(HashWithSearch)
+
+                pool=@data.keys.first
+                return print_table(nil, options) if !pool
+
+                element=pool.split('_').first
+
+                pool_data=@data.dsearch("#{pool}/#{element}")
+                pool_data=[pool_data].flatten if pool_data
+
+                print_table(pool_data, options)
+            else
+                print_table(data, options)
+            end
         end
 
         def top(options={}, &block)
@@ -176,11 +227,11 @@ module CLIHelper
 
             begin
                 while true
+                    data = block.call
+
                     CLIHelper.scr_cls
                     CLIHelper.scr_move(0,0)
 
-                    data = block.call
-
                     show(data, options)
                     sleep delay
                 end
@@ -200,7 +251,7 @@ module CLIHelper
         private
 
         def print_table(data, options)
-            CLIHelper.print_header(header_str)
+            CLIHelper.print_header(header_str) if !options[:csv]
             data ? print_data(data, options) : puts
         end
 
@@ -216,21 +267,26 @@ module CLIHelper
             end
 
             begin
-                print res_data.collect{|l|
-                    (0..ncolumns-1).collect{ |i|
-                        dat=l[i]
-                        col=@default_columns[i]
+                if options[:csv]
+                    CSV($stdout, :write_headers => true,
+                                 :headers => @default_columns) do |csv|
+                        res_data.each {|l| csv << l }
+                    end
+                else
+                    res_data.each{|l|
+                        puts (0..ncolumns-1).collect{ |i|
+                            dat=l[i]
+                            col=@default_columns[i]
 
-                        str=format_str(col, dat)
-                        str=CLIHelper.color_state(str) if i==stat_column
+                            str=format_str(col, dat)
+                            str=CLIHelper.color_state(str) if i==stat_column
 
-                        str
-                    }.join(' ')
-                }.join("\n").gsub(/ *$/, '')
+                            str
+                        }.join(' ').rstrip
+                    }
+                end
             rescue Errno::EPIPE
             end
-
-            puts
         end
 
         def data_array(data, options)

data/lib/command_parser.rb

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

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #
@@ -16,13 +16,19 @@
 
 require 'cli_helper'
 
-require 'opennebula'
+begin
+    require 'opennebula'
+rescue Exception => e
+    puts "Error: "+e.message.to_s
+    exit(-1)
+end
+
 include OpenNebula
 
 module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
-Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs
+Copyright 2002-2014, 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
@@ -94,18 +100,91 @@ EOT
             :name   => 'user',
             :large  => '--user name',
             :description => 'User name used to connect to OpenNebula',
-            :format => String
+            :format => String,
+            :proc => lambda do |o, options|
+                OneHelper.set_user(o)
+                [0, o]
+            end
         },
         {
             :name   => 'password',
             :large  => '--password password',
             :description => 'Password to authenticate with OpenNebula',
-            :format => String
+            :format => String,
+            :proc => lambda do |o, options|
+                OneHelper.set_password(o)
+                [0, o]
+            end
         },
         {
             :name   => 'endpoint',
             :large  => '--endpoint endpoint',
             :description => 'URL of OpenNebula xmlrpc frontend',
+            :format => String,
+            :proc => lambda do |o, options|
+                OneHelper.set_endpoint(o)
+                [0, o]
+            end
+        }
+    ]
+
+    GROUP_OPTIONS=[
+        {
+            :name   => 'name',
+            :large  => '--name name',
+            :short => "-n",
+            :description =>
+                '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',
+            :short => "-u",
+            :description =>
+                'Creates an admin user for the group with name',
+            :format => String
+        },
+        {
+            :name   => 'admin_password',
+            :large  => '--admin_password password',
+            :short => "-p",
+            :description =>
+                'Password for the admin user of the group',
+            :format => String
+        },
+        {
+            :name   => 'admin_driver',
+            :large  => '--admin_driver auth_driver',
+            :short => "-d",
+            :description =>
+                'Auth driver for the admin user of the group',
+            :format => String
+        },
+        {
+            :name   => 'resources',
+            :large  => '--resources resources_str',
+            :short => "-r",
+            :description =>
+                'Which resources can be created by group users "\
+                "(VM+NET+IMAGE+TEMPLATE by default)',
+            :format => String
+        },
+        {
+            :name   => 'admin_resources',
+            :large  => '--admin_resources resources_str',
+            :short => "-o",
+            :description =>
+                'Which resources can be created by group users "\
+                "(VM+NET+IMAGE+TEMPLATE by default)',
             :format => String
         }
     ]
@@ -273,18 +352,31 @@ EOT
     class OneHelper
         attr_accessor :client
 
-        def self.get_client(options)
-            if defined?(@@client)
+        def self.get_client(options={}, force=false)
+            if !force && defined?(@@client)
                 @@client
             else
+
                 secret=nil
-                user=options[:user]
+                password=nil
+
+                if defined?(@@user)
+                    user=@@user
+                    password=@@password if defined?(@@password)
+                else
+                    user=options[:user]
+                end
+
                 if user
-                    password=options[:password]||self.get_password
+                    password=password||options[:password]||self.get_password
                     secret="#{user}:#{password}"
                 end
 
-                endpoint=options[:endpoint]
+                if defined?(@@endpoint)
+                    endpoint=@@endpoint
+                else
+                    endpoint=options[:endpoint]
+                end
 
                 @@client=OpenNebula::Client.new(secret, endpoint)
             end
@@ -294,10 +386,22 @@ EOT
             if defined?(@@client)
                 @@client
             else
-                self.get_client({})
+                self.get_client
             end
         end
 
+        def self.set_user(user)
+            @@user=user
+        end
+
+        def self.set_password(password)
+            @@password=password
+        end
+
+        def self.set_endpoint(endpoint)
+            @@endpoint=endpoint
+        end
+
         if RUBY_VERSION>="1.9.3"
             require 'io/console'
             def self.get_password
@@ -307,6 +411,7 @@ EOT
                 puts
 
                 pass.chop! if pass
+                @@password=pass
                 pass
             end
         else
@@ -314,8 +419,9 @@ EOT
             def self.get_password
                 print "Password: "
                 system("stty", "-echo")
+                @@password=gets.chop
                 begin
-                    return gets.chop
+                    return @@password
                 ensure
                     system("stty", "echo")
                     print "\n"
@@ -330,7 +436,7 @@ EOT
         end
 
         def set_client(options)
-            @client=OpenNebulaHelper::OneHelper.get_client(options)
+            @client=OpenNebulaHelper::OneHelper.get_client(options, true)
         end
 
         def create_resource(options, &block)
@@ -357,25 +463,29 @@ EOT
 
             pool = factory_pool(filter_flag)
 
-            rc = pool.info
-            return -1, rc.message if OpenNebula.is_error?(rc)
-
             if options[:xml]
+                # TODO: use paginated functions
+                rc=pool.info
+                return -1, rc.message if OpenNebula.is_error?(rc)
                 return 0, pool.to_xml(true)
             else
                 table = format_pool(options)
 
                 if top
                     table.top(options) {
-                        pool.info
-                        pool_to_array(pool)
+                        array=pool.get_hash
+                        return -1, array.message if OpenNebula.is_error?(array)
+
+                        array
                     }
                 else
-                    array=pool_to_array(pool)
+                    array=pool.get_hash
+                    return -1, array.message if OpenNebula.is_error?(array)
 
                     if options[:ids]
-                        array=array.select do |element|
-                            options[:ids].include? element['ID'].to_i
+                        rname=self.class.rname
+                        array["#{rname}_POOL"][rname].reject! do |element|
+                            !options[:ids].include?(element['ID'].to_i)
                         end
                     end
 
@@ -495,6 +605,10 @@ EOT
         end
 
         def self.name_to_id(name, pool, ename)
+            if ename=="CLUSTER" and name.upcase=="ALL"
+                return 0, "ALL"
+            end
+
             objects=pool.select {|object| object.name==name }
 
             if objects.length>0
@@ -610,6 +724,7 @@ EOT
         when "IMAGE"     then OpenNebula::ImagePool.new(client)
         when "VMTEMPLATE" then OpenNebula::TemplatePool.new(client)
         when "VM"        then OpenNebula::VirtualMachinePool.new(client)
+        when "ZONE"      then OpenNebula::ZonePool.new(client)
         end
 
         rc = pool.info

data/lib/one_helper/oneacct_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #
@@ -87,7 +87,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :name  => "json",
         :short => "-j",
         :large => "--json",
-        :description => "Show the resource in xml format"
+        :description => "Show the resource in json format"
     }
 
     SPLIT={
@@ -100,6 +100,10 @@ class AcctHelper < OpenNebulaHelper::OneHelper
 
 
     ACCT_TABLE = CLIHelper::ShowTable.new("oneacct.yaml", nil) do
+        column :UID, "User ID", :size=>4 do |d|
+            d["UID"]
+        end
+
         column :VID, "Virtual Machine ID", :size=>4 do |d|
             d["OID"]
         end
@@ -181,4 +185,4 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         CLIHelper.scr_restore
         puts
     end
-end
+end