opennebula-cli 3.9.0.beta → 3.9.80.beta

data/lib/one_helper/onequota_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/onetemplate_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    #
@@ -23,7 +23,7 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper
         :format => String,
         :description =>  <<-EOT.strip
 Name of the new VM or TEMPLATE. When instantiating
-                               multiple VMs you can use the\"%i\" wildcard to produce
+                               multiple VMs you can use the \"%i\" wildcard to produce
                                different names such as vm-0, vm-1...
 EOT
     }
@@ -91,7 +91,7 @@ EOT
         OpenNebula::TemplatePool.new(@client, user_flag)
     end
 
-    def format_resource(template)
+    def format_resource(template, options = {})
         str="%-15s: %-20s"
         str_h1="%-80s"
 

data/lib/one_helper/oneuser_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    #
@@ -42,7 +42,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         end
 
         if options[:driver] == OpenNebula::User::X509_AUTH
-            password.delete!("\s")
+            require 'opennebula/x509_auth'
+            password = OpenNebula::X509Auth.escape_dn(password)
         end
 
         if options[:sha1] || options[:driver] == OpenNebula::User::CIPHER_AUTH
@@ -147,12 +148,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
-        system = System.new(@client)
-        default_quotas = system.get_user_quotas()
-
-        if OpenNebula::is_error?(default_quotas)
-            raise "Error retrieving the default user quotas: #{default_quotas.message}"
-        end
+        prefix = '/USER_POOL/DEFAULT_USER_QUOTAS/'
+        user_pool = @user_pool
 
         table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, "ONE identifier for the User", :size=>4 do |d|
@@ -176,7 +173,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                     limit = d['VM_QUOTA']['VM']["VMS"]
 
                     if limit == "-1"
-                        limit = default_quotas['VM_QUOTA/VM/VMS']
+                        limit = user_pool["#{prefix}VM_QUOTA/VM/VMS"]
                         limit = "0" if limit.nil? || limit == ""
                     end
 
@@ -191,7 +188,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                     limit = d['VM_QUOTA']['VM']["MEMORY"]
 
                     if limit == "-1"
-                        limit = default_quotas['VM_QUOTA/VM/MEMORY']
+                        limit = user_pool["#{prefix}VM_QUOTA/VM/MEMORY"]
                         limit = "0" if limit.nil? || limit == ""
                     end
 
@@ -208,7 +205,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                     limit = d['VM_QUOTA']['VM']["CPU"]
 
                     if limit == "-1"
-                        limit = default_quotas['VM_QUOTA/VM/CPU']
+                        limit = user_pool["#{prefix}VM_QUOTA/VM/CPU"]
                         limit = "0" if limit.nil? || limit == ""
                     end
 
@@ -241,16 +238,12 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
     def factory_pool(user_flag=-2)
         #TBD OpenNebula::UserPool.new(@client, user_flag)
-        OpenNebula::UserPool.new(@client)
+        @user_pool = OpenNebula::UserPool.new(@client)
+        return @user_pool
     end
 
-    def format_resource(user)
+    def format_resource(user, options = {})
         system = System.new(@client)
-        default_quotas = system.get_user_quotas()
-
-        if OpenNebula::is_error?(default_quotas)
-            raise "Error retrieving the default user quotas: #{default_quotas.message}"
-        end
 
         str="%-15s: %-20s"
         str_h1="%-80s"
@@ -272,6 +265,12 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
 
         user_hash = user.to_hash
 
+        default_quotas = nil
+
+        user.each('/USER/DEFAULT_USER_QUOTAS') { |elem|
+            default_quotas = elem
+        }
+
         helper = OneQuotaHelper.new
         helper.format_quota(user_hash['USER'], default_quotas)
     end

data/lib/one_helper/onevm_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 OneVMHelper < OpenNebulaHelper::OneHelper
     MULTIPLE={
@@ -36,6 +37,17 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         }
     }
 
+    NETWORK = {
+        :name   => "network",
+        :short  => "-n id|name",
+        :large  => "--network id|name" ,
+        :description => "Selects the virtual network",
+        :format => String,
+        :proc   => lambda { |o, options|
+            OpenNebulaHelper.rname_to_id(o, "VNET")
+        }
+    }
+
     FILE = {
         :name   => "file",
         :short  => "-f file",
@@ -51,6 +63,44 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         }
     }
 
+    HOLD = {
+        :name  => "hold",
+        :large => "--hold",
+        :description => "Creates the new VM on hold state instead of pending"
+    }
+
+    SCHEDULE = {
+        :name       => "schedule",
+        :large      => "--schedule TIME",
+        :description => "Schedules this action to be executed after" \
+        "the given time. For example: onevm resume 0 --schedule \"09/23 14:15\"",
+        :format     => Time
+    }
+
+    ALL_TEMPLATE = {
+        :name       => "all",
+        :large      => "--all",
+        :description => "Show all template data"
+    }
+
+    LIVE = {
+        :name        => "live",
+        :large       => "--live",
+        :description => "Do the action with the VM running"
+    }
+
+    HARD = {
+        :name       => "hard",
+        :large      => "--hard",
+        :description=> "Does not communicate with the guest OS"
+    }
+
+    RECREATE = {
+        :name       => "recreate",
+        :large      => "--recreate",
+        :description=> "Resubmits a fresh VM"
+    }
+
     def self.rname
         "VM"
     end
@@ -115,7 +165,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             column :HOST, "Host where the VM is running", :left, :size=>10 do |d|
                 if d['HISTORY_RECORDS'] && d['HISTORY_RECORDS']['HISTORY']
                     state_str = VirtualMachine::VM_STATE[d['STATE'].to_i]
-                    if %w{ACTIVE SUSPENDED}.include? state_str
+                    if %w{ACTIVE SUSPENDED POWEROFF}.include? state_str
                         d['HISTORY_RECORDS']['HISTORY']['HOSTNAME']
                     end
                 end
@@ -135,6 +185,38 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         table
     end
 
+
+    def schedule_actions(ids,options,action)
+        # Verbose by default
+        options[:verbose] = true
+
+        perform_actions(
+            ids, options,
+            "#{action} scheduled at #{options[:schedule]}") do |vm|
+
+            rc = vm.info
+
+            if OpenNebula.is_error?(rc)
+                puts rc.message
+                exit -1
+            end
+
+            ids = vm.retrieve_elements('USER_TEMPLATE/SCHED_ACTION/ID')
+
+            id = 0
+            if (!ids.nil? && !ids.empty?)
+                ids.map! {|e| e.to_i }
+                id = ids.max + 1
+            end
+
+            tmp_str = vm.user_template_str
+
+            tmp_str << "\nSCHED_ACTION = [ID = #{id}, ACTION = #{action}, TIME = #{options[:schedule].to_i}]"
+
+            vm.update(tmp_str)
+        end
+    end
+
     private
 
     def factory(id=nil)
@@ -150,7 +232,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         OpenNebula::VirtualMachinePool.new(@client, user_flag)
     end
 
-    def format_resource(vm)
+    def format_resource(vm, options = {})
         str_h1="%-80s"
         str="%-20s: %-20s"
 
@@ -204,18 +286,247 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
             puts str % [e,  mask]
         }
-        puts
 
-        CLIHelper.print_header(str_h1 % "VIRTUAL MACHINE TEMPLATE",false)
-        puts vm.template_str
+        if vm.has_elements?("/VM/TEMPLATE/DISK")
+            puts
+            CLIHelper.print_header(str_h1 % "VM DISKS",false)
+            CLIHelper::ShowTable.new(nil, self) do
+                column :ID, "", :size=>3 do |d|
+                    d["DISK_ID"]
+                end
 
-        if vm.has_elements?("/VM/HISTORY_RECORDS")
+                column :DATASTORE, "", :left, :size=>10 do |d|
+                    d["DATASTORE"]
+                end
+
+                column :TARGET, "", :left, :size=>6 do |d|
+                    d["TARGET"]
+                end
+
+                column :IMAGE, "", :left, :size=>35 do |d|
+                    if d["IMAGE"]
+                        d["IMAGE"]
+                    else
+                        case d["TYPE"].upcase
+                        when "FS"
+                            "#{d["FORMAT"]} - "<<
+                            OpenNebulaHelper.unit_to_str(d["SIZE"].to_i,
+                                                         {}, "M")
+                        when "SWAP"
+                            OpenNebulaHelper.unit_to_str(d["SIZE"].to_i,
+                                                         {}, "M")
+
+                        end
+                    end
+                end
+
+                column :TYPE, "", :left, :size=>4 do |d|
+                    d["TYPE"].downcase
+                end
+
+                column :"R/O", "", :size=>3 do |d|
+                    d["READONLY"]
+                end
+
+                column :"SAVE", "", :size=>4 do |d|
+                    d["SAVE"] || "NO"
+                end
+
+                column :"CLONE", "", :size=>5 do |d|
+                    d["CLONE"]
+                end
+
+                column :"SAVE_AS", "", :size=>7 do |d|
+                    d["SAVE_AS"] || "-"
+                end
+
+
+                default :ID, :TARGET, :IMAGE, :TYPE,
+                    :SAVE, :SAVE_AS
+            end.show([vm.to_hash['VM']['TEMPLATE']['DISK']].flatten, {})
+
+            while vm.has_elements?("/VM/TEMPLATE/DISK")
+                vm.delete_element("/VM/TEMPLATE/DISK")
+            end if !options[:all]
+        end
+
+        if vm.has_elements?("/VM/TEMPLATE/NIC")
+            puts
+            CLIHelper.print_header(str_h1 % "VM NICS",false)
+
+            vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
+
+            nic_default = {"NETWORK" => "-",
+                           "IP" => "-",
+                           "MAC"=> "-",
+                           "VLAN"=>"no",
+                           "BRIDGE"=>"-"}
+
+            array_id = 0
+
+            vm_nics.each {|nic|
+
+                next if nic.has_key?("CLI_DONE")
+
+                if nic.has_key?("IP6_LINK")
+                    ip6_link = {"IP"           => nic.delete("IP6_LINK"),
+                                "CLI_DONE"     => true,
+                                "DOUBLE_ENTRY" => true}
+                    vm_nics.insert(array_id+1,ip6_link)
+
+                    array_id += 1
+                end
+
+                if nic.has_key?("IP6_SITE")
+                    ip6_link = {"IP"           => nic.delete("IP6_SITE"),
+                                "CLI_DONE"     => true,
+                                "DOUBLE_ENTRY" => true}
+                    vm_nics.insert(array_id+1,ip6_link)
+
+                    array_id += 1
+                end
+
+                if nic.has_key?("IP6_GLOBAL")
+                    ip6_link = {"IP"           => nic.delete("IP6_GLOBAL"),
+                                "CLI_DONE"     => true,
+                                "DOUBLE_ENTRY" => true}
+                    vm_nics.insert(array_id+1,ip6_link)
+
+                    array_id += 1
+                end
+
+                nic.merge!(nic_default) {|k,v1,v2| v1}
+                array_id += 1
+            }
+
+            CLIHelper::ShowTable.new(nil, self) do
+                column :ID, "", :size=>3 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["NIC_ID"]
+                    end
+                end
+
+                column :NETWORK, "", :left, :size=>20 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["NETWORK"]
+                    end
+                end
+
+                column :VLAN, "", :size=>4 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["VLAN"].downcase
+                    end
+                end
+
+                column :BRIDGE, "", :left, :size=>12 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["BRIDGE"]
+                    end
+                end
+
+                column :IP, "",:left, :donottruncate, :size=>15 do |d|
+                    d["IP"]
+                end
+
+                column :MAC, "", :left, :size=>17 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["MAC"]
+                    end
+                end
+
+            end.show(vm_nics,{})
+
+            while vm.has_elements?("/VM/TEMPLATE/NIC")
+                vm.delete_element("/VM/TEMPLATE/NIC")
+            end if !options[:all]
+        end
+
+        if vm.has_elements?("/VM/TEMPLATE/SNAPSHOT")
             puts
+            CLIHelper.print_header(str_h1 % "SNAPSHOTS",false)
+
+            CLIHelper::ShowTable.new(nil, self) do
 
+                column :"ID", "", :size=>4 do |d|
+                    d["SNAPSHOT_ID"] if !d.nil?
+                end
+
+                column :"TIME", "", :size=>12 do |d|
+                    OpenNebulaHelper.time_to_str(d["TIME"], false) if !d.nil?
+                end
+
+                column :"NAME", "", :left, :size=>46 do |d|
+                    d["NAME"] if !d.nil?
+                end
+
+                column :"HYPERVISOR_ID", "", :left, :size=>15 do |d|
+                    d["HYPERVISOR_ID"] if !d.nil?
+                end
+
+            end.show([vm.to_hash['VM']['TEMPLATE']['SNAPSHOT']].flatten, {})
+
+            vm.delete_element("/VM/TEMPLATE/SNAPSHOT")
+        end
+
+        if vm.has_elements?("/VM/HISTORY_RECORDS")
+            puts
 
             CLIHelper.print_header(str_h1 % "VIRTUAL MACHINE HISTORY",false)
             format_history(vm)
         end
+
+        if vm.has_elements?("/VM/USER_TEMPLATE/SCHED_ACTION")
+            puts
+            CLIHelper.print_header(str_h1 % "SCHEDULED ACTIONS",false)
+
+            CLIHelper::ShowTable.new(nil, self) do
+
+                column :"ID", "", :size=>2 do |d|
+                    d["ID"] if !d.nil?
+                end
+
+                column :"ACTION", "", :left, :size=>15 do |d|
+                    d["ACTION"] if !d.nil?
+                end
+
+                column :"SCHEDULED", "", :size=>12 do |d|
+                    OpenNebulaHelper.time_to_str(d["TIME"], false) if !d.nil?
+                end
+
+                column :"DONE", "", :size=>12 do |d|
+                    OpenNebulaHelper.time_to_str(d["DONE"], false) if !d.nil?
+                end
+
+                column :"MESSAGE", "", :left, :donottruncate, :size=>35 do |d|
+                    d["MESSAGE"] if !d.nil?
+                end
+            end.show([vm.to_hash['VM']['USER_TEMPLATE']['SCHED_ACTION']].flatten, {})
+        end
+
+        if vm.has_elements?("/VM/USER_TEMPLATE")
+            puts
+
+            if !options[:all]
+                vm.delete_element("/VM/USER_TEMPLATE/SCHED_ACTION")
+            end
+
+            CLIHelper.print_header(str_h1 % "USER TEMPLATE",false)
+            puts vm.template_like_str('USER_TEMPLATE')
+        end
+
+        puts
+        CLIHelper.print_header(str_h1 % "VIRTUAL MACHINE TEMPLATE",false)
+        puts vm.template_str
     end
 
     def format_history(vm)
@@ -224,7 +535,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 d["SEQ"]
             end
 
-            column :HOST, "Host name of the VM container", :left, :size=>15 do |d|
+            column :HOST, "Host name of the VM container", :left, :size=>20 do |d|
                 d["HOSTNAME"]
             end