opennebula-cli 4.14.2 → 4.90.0.beta1

data/bin/onevcenter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -195,6 +195,148 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
                     next if STDIN.gets.strip.downcase != 'y'
 
+                    ds_input = ""
+                    rp_input = ""
+
+                    # Datastores
+
+                    STDOUT.print "\n    This template is currently set to be "\
+                                 "deployed in datastore #{t[:default_ds]}."\
+                               "\n    Press y to keep the default, n to select"\
+                               " a new datastore or d to delegate the choice"\
+                               " to the user [y/n/d]? "
+
+                    answer =  STDIN.gets.strip.downcase
+
+                    case answer 
+                    when 'd'
+                      ds_split     = t[:ds].split("|")
+                      list_of_ds   = ds_split[-2]
+                      default_ds   = ds_split[-1]
+                      ds_input     = ds_split[0] + "|" + ds_split[1] + "|" +
+                                     ds_split[2] + "|"
+
+                      # Available list of datastores
+
+                      input_str = "    The list of available datastores to be"\
+                                  " presented to the user are \"#{list_of_ds}\""
+                      input_str+= "\n    Press y to agree, or input a comma"\
+                                  " separated list of datastores to edit "\
+                                  "[y/comma separated list] "
+                      STDOUT.print input_str
+
+                      answer = STDIN.gets.strip
+
+                      if answer.downcase == 'y'
+                           ds_input += ds_split[3] + "|"
+                      else
+                           ds_input += answer + "|"
+                      end
+
+                      # Default
+                      input_str   = "    The default datastore presented to "\
+                                    "the end user is set to \"#{default_ds}\"."
+                      input_str+= "\n    Press y to agree, or input a new "\
+                                  "datastore [y/datastore name] "
+                      STDOUT.print input_str
+
+                      answer = STDIN.gets.strip
+
+                      if answer.downcase == 'y'
+                           ds_input += ds_split[4]
+                      else
+                           ds_input += answer
+                      end
+                    when 'n'
+                      ds_split     = t[:ds].split("|")
+                      list_of_ds   = ds_split[-2]
+
+                      input_str = "    The list of available datastores is"\
+                                  " \"#{list_of_ds}\"."
+                      input_str+= "\n    Please input the new default datastore: "
+                      STDOUT.print input_str
+
+                      answer = STDIN.gets.strip
+
+                      t[:one] += "VCENTER_DATASTORE=\"#{answer}\"\n"
+                    end
+
+                    # Resource Pools
+
+                    rp_split     = t[:rp].split("|")
+
+                    if rp_split.size > 3
+                    STDOUT.print "\n    This template is currently set to "\
+                                 "launch VMs in the default resource pool."\
+                               "\n    Press y to keep this behaviour, n to select"\
+                               " a new resource pool or d to delegate the choice"\
+                               " to the user [y/n/d]? "
+
+                    answer =  STDIN.gets.strip.downcase
+
+                    case answer 
+                    when 'd'
+                       list_of_rp   = rp_split[-2]
+                       default_rp   = rp_split[-1]
+                       rp_input     = rp_split[0] + "|" + rp_split[1] + "|" +
+                                      rp_split[2] + "|"
+
+                       # Available list of resource pools
+
+                       input_str = "    The list of available resource pools "\
+                                   "to be presented to the user are "\
+                                   "\"#{list_of_rp}\""
+                       input_str+= "\n    Press y to agree, or input a comma"\
+                                   " separated list of resource pools to edit "\
+                                   "[y/comma separated list] "
+                       STDOUT.print input_str
+
+                       answer = STDIN.gets.strip
+
+                       if answer.downcase == 'y'
+                            rp_input += rp_split[3] + "|"
+                       else
+                            rp_input += answer + "|"
+                       end
+
+                       # Default
+                       input_str   = "    The default resource pool presented "\
+                                     "to the end user is set to"\
+                                     " \"#{default_rp}\"."
+                       input_str+= "\n    Press y to agree, or input a new "\
+                                   "resource pool [y/resource pool name] "
+                       STDOUT.print input_str
+
+                       answer = STDIN.gets.strip
+
+                       if answer.downcase == 'y'
+                            rp_input += rp_split[4]
+                       else
+                            rp_input += answer
+                       end
+                    when 'n'
+                      list_of_rp   = rp_split[-2]
+
+                      input_str = "    The list of available resource pools is"\
+                                  " \"#{list_of_rp}\"."
+                      input_str+= "\n    Please input the new default resource pool: "
+                      STDOUT.print input_str
+
+                      answer = STDIN.gets.strip
+
+                      t[:one] += "RESOURCE_POOL=\"#{answer}\"\n"
+                    end
+                    end
+
+                    if ds_input != "" ||
+                       rp_input != ""
+                       t[:one] += "USER_INPUTS=["
+                       t[:one] += "VCENTER_DATASTORE=\"#{ds_input}\"," if ds_input != ""
+                       t[:one] += "RESOURCE_POOL=\"#{rp_input}\"," if rp_input != ""
+                       t[:one] = t[:one][0..-2]
+                       t[:one] += "]"
+                    end
+
                     one_t = ::OpenNebula::Template.new(
                                 ::OpenNebula::Template.build_xml, vc.one)
 
@@ -368,4 +510,148 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         exit 0
     end
+
+    datastores_desc = <<-EOT.unindent
+        Import vCenter Datastores into OpenNebula
+    EOT
+
+    command :datastores, datastores_desc, :options=>[ VCENTER, USER, PASS ] do
+        if  options[:vuser].nil? ||
+            options[:vpass].nil? ||
+            options[:vcenter].nil?
+            STDERR.puts "vCenter connection parameters are mandatory to import"\
+                        " Datastores:\n"\
+                        "\t --vcenter vCenter hostname\n"\
+                        "\t --vuser username to login in vcenter\n"\
+                        "\t --vpass password for the user"
+            exit -1
+        end
+
+        begin
+            STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
+
+            vc = VCenterDriver::VIClient.new_connection(
+                    :user     => options[:vuser],
+                    :password => options[:vpass],
+                    :host     => options[:vcenter])
+
+            STDOUT.print "done!\n\n"
+
+            STDOUT.print "Looking for Datastores..."
+
+            rs = vc.vcenter_datastores
+
+            STDOUT.print "done!\n"
+
+            rs.each {|dc, tmps|
+                STDOUT.print "\nDo you want to process datacenter #{dc} [y/n]? "
+
+                next if STDIN.gets.strip.downcase != 'y'
+
+                if tmps.empty?
+                    STDOUT.print "    No new Datastores found in #{dc}...\n\n"
+                    next
+                end
+
+                tmps.each{ |d|
+                    STDOUT.print "\n  * Datastore found:\n"\
+                                 "      - Name      : #{d[:name]}\n"\
+                                 "      - Total MB  : #{d[:total_mb]}\n"\
+                                 "      - Free  MB  : #{d[:free_mb]}\n"\
+                                 "      - Cluster   : #{d[:cluster]}\n"\
+                                 "    Import this Datastore [y/n]? "
+
+                    next if STDIN.gets.strip.downcase != 'y'
+
+                    one_d = ::OpenNebula::Datastore.new(
+                                ::OpenNebula::Datastore.build_xml, vc.one)
+
+                    rc = one_d.allocate(d[:one])
+
+                    if ::OpenNebula.is_error?(rc)
+                        STDOUT.puts "    Error creating datastore: #{rc.message}\n"\
+                                    "    One datastore can exist only once, and "\
+                                    "can be used in any vCenter Cluster that "\
+                                    "has access to it. Also, no spaces allowed "\
+                                    "in datastore name (rename it in vCenter "\
+                                    "and try again)"
+                    else
+                        STDOUT.puts "    OpenNebula datastore #{one_d.id} created!\n"
+                    end
+                }
+            }
+        rescue Exception => e
+            STDOUT.puts "error: #{e.message}"
+            exit -1
+        end
+
+        exit 0
+    end
+
+    images_desc = <<-EOT.unindent
+        Import vCenter Images into OpenNebula
+    EOT
+
+    command :images, images_desc, :ds_name, :options=>[ VCENTER, USER, PASS ] do
+        ds_name = args[0]
+
+        if !ds_name
+            STDERR.puts "Datastore name needed to import images from"
+            exit -1
+        end
+
+        if  options[:vuser].nil? ||
+            options[:vpass].nil? ||
+            options[:vcenter].nil?
+            STDERR.puts "vCenter connection parameters are mandatory to import"\
+                        " Datastores:\n"\
+                        "\t --vcenter vCenter hostname\n"\
+                        "\t --vuser username to login in vcenter\n"\
+                        "\t --vpass password for the user"
+            exit -1
+        end
+
+        begin
+            STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
+
+            vc = VCenterDriver::VIClient.new_connection(
+                    :user     => options[:vuser],
+                    :password => options[:vpass],
+                    :host     => options[:vcenter])
+
+            STDOUT.print "done!\n\n"
+
+            STDOUT.print "Looking for Images..."
+
+            images = vc.vcenter_images(ds_name)
+
+            STDOUT.print "done!\n"
+
+            images.each{ |i|
+                    STDOUT.print "\n  * Image found:\n"\
+                                 "      - Name      : #{i[:name]}\n"\
+                                 "      - Path      : #{i[:path]}\n"\
+                                 "      - Type      : #{i[:type]}\n"\
+                                 "    Import this Image [y/n]? "
+
+                    next if STDIN.gets.strip.downcase != 'y'
+
+                    one_i = ::OpenNebula::Image.new(
+                                ::OpenNebula::Image.build_xml, vc.one)
+
+                    rc = one_i.allocate(i[:one], i[:dsid].to_i)
+
+                    if ::OpenNebula.is_error?(rc)
+                        STDOUT.puts "    Error creating image: #{rc.message}\n"
+                    else
+                        STDOUT.puts "    OpenNebula image #{one_i.id} created!\n"
+                    end
+            }
+        rescue Exception => e
+            STDOUT.puts "error: #{e.message}"
+            exit -1
+        end
+
+        exit 0
+    end
 end

data/bin/onevdc

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -148,6 +148,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

data/bin/onevm

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -63,14 +63,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Overrides the DEV_PREFIX of the image"
     }
 
-    IP={
-        :name => "ip",
-        :short => "-i ip",
-        :large => "--ip ip",
-        :format => String,
-        :description => "IP address for the new NIC"
-    }
-
     CACHE={
         :name => "cache",
         :large => "--cache cache_mode",
@@ -112,6 +104,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Recover a VM by retrying the last failed action"
     }
 
+    DELETE={
+        :name  => "delete",
+        :large => "--delete",
+        :description => "No recover action possible, delete the VM"
+    }
+
+    RECREATE={
+        :name  => "recreate",
+        :large => "--recreate",
+        :description => "No recover action possible, delete and recreate the VM"
+    }
+
     INTERACTIVE={
         :name  => "interactive",
         :large => "--interactive",
@@ -263,32 +267,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1], 'USER_TEMPLATE')
             end
 
-            obj.update(str, options[:append])
-        end
-    end
-
-    delete_desc = <<-EOT.unindent
-        Deletes the given VM. Using --recreate resubmits the VM.
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
 
-        Resubmits the VM to PENDING state. This is intended for VMs stuck in a
-        transient state. To re-deploy a fresh copy of the same VM, create a
-        Template and instantiate it, see 'onetemplate instantiate'
-
-        States: ANY
-    EOT
-
-    command :delete, delete_desc, [:range, :vmid_list],
-        :options => [OneVMHelper::SCHEDULE, OneVMHelper::RECREATE] do
-
-        command_name="delete"
-        command_name<<"-recreate" if options[:recreate]
-
-        if (!options[:schedule].nil?)
-            helper.schedule_actions(args[0], options, command_name)
-        else
-            helper.perform_actions(args[0],options,"deleted") do |vm|
-                vm.delete(options[:recreate]==true)
-            end
+            obj.update(str, options[:append])
         end
     end
 
@@ -366,25 +348,25 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    shutdown_desc = <<-EOT.unindent
-        Shuts down the given VM. The VM life cycle will end.
+    terminate_desc = <<-EOT.unindent
+        Terminates the given VM. The VM life cycle will end.
 
         With --hard it unplugs the VM.
 
-        States: RUNNING, UNKNOWN (with --hard)
+        States: valid if no operation is being performed on the VM
     EOT
 
-    command :shutdown, shutdown_desc, [:range,:vmid_list],
+    command :terminate, terminate_desc, [:range,:vmid_list],
         :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
 
-        command_name='shutdown'
+        command_name='terminate'
         command_name<<'-hard' if options[:hard]
 
         if (!options[:schedule].nil?)
             helper.schedule_actions(args[0], options, command_name)
         else
-            helper.perform_actions(args[0],options,"shutting down") do |vm|
-                vm.shutdown(options[:hard]==true)
+            helper.perform_actions(args[0],options,"terminated") do |vm|
+                vm.terminate(options[:hard]==true)
             end
         end
     end
@@ -558,9 +540,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     recover_desc = <<-EOT.unindent
         Recovers a stuck VM that is waiting for a driver operation. The recovery
-        may be done by failing, succeeding or retrying the current operation. YOU NEED
-        TO MANUALLY CHECK THE VM STATUS ON THE HOST, to decide if the operation
-        was successful or not, or if it can be retried.
+        may be done by failing, succeeding or retrying the current operation.
+        YOU NEED TO MANUALLY CHECK THE VM STATUS ON THE HOST, to decide if the
+        operation was successful or not, or if it can be retried.
 
         Example: A VM is stuck in "migrate" because of a hardware failure. You
         need to check if the VM is running in the new host or not to recover
@@ -568,21 +550,29 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         States for success/failure recovers: Any ACTIVE state.
         States for a retry recover: Any *FAILURE state
+        States for delete: Any
+        States for delete-recreate: Any but STOP/UNDEPLOYED
     EOT
 
     command :recover, recover_desc, [:range,:vmid_list],
-        :options => [SUCCESS, FAILURE, RETRY, INTERACTIVE] do
+        :options => [SUCCESS, FAILURE, RETRY, INTERACTIVE, DELETE, RECREATE] do
         if !options[:success].nil?
             result = 1
         elsif !options[:failure].nil?
             result = 0
         elsif !options[:retry].nil?
             result = 2
+        elsif !options[:delete].nil?
+            result = 3
+        elsif !options[:recreate].nil?
+            result = 4
         else
             STDERR.puts "Need to specify the result of the pending action."
             STDERR.puts "\t--success recover the VM by succeeding the missing action."
             STDERR.puts "\t--failure recover the VM by failing the missing action."
             STDERR.puts "\t--retry recover the VM by retrying the last failed action."
+            STDERR.puts "\t--delete no recover possible, delete the VM."
+            STDERR.puts "\t--recreate no recover possible, delete and recreate the VM."
             exit -1
         end
 
@@ -666,7 +656,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"nic-attach", nic_attach_desc, :vmid,
-            :options => [OneVMHelper::FILE, OneVMHelper::NETWORK, IP] do
+            :options => [OneVMHelper::FILE, OneVMHelper::NETWORK, OneVMHelper::IP] do
 
         if options[:file].nil? and options[:network].nil?
             STDERR.puts "Provide a template file or a network:"
@@ -831,7 +821,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     disk_snapshot_revert_desc = <<-EOT.unindent
         Reverts disk state to a previously taken snapshot.
 
-        States: RUNNING, POWEROFF, SUSPENDED
+        States: POWEROFF, SUSPENDED
     EOT
 
     command :"disk-snapshot-revert", disk_snapshot_revert_desc,
@@ -934,15 +924,47 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    updateconf_desc = <<-EOT.unindent
+        Updates the configuration of a VM. The VM cannot be in a active (running)
+        state, valid states are: pending, failure, poweroff, undeploy, hold or
+        clonning.
+
+        This command accepts a template file or opens an editor, the full list of
+        configuration attributes are:
+
+        OS       = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT"]
+        FEATURES = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT"]
+        INPUT    = ["TYPE", "BUS"]
+        GRAPHICS = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
+        RAW      = ["DATA", "DATA_VMX", "TYPE"]
+        CONTEXT (any value, **variable substitution will be made**)
+    EOT
+
+    command :updateconf, updateconf_desc, :vmid, [:file, nil] do
+        template = ""
+
+        begin
+            template=File.read(args[1]) if args[1]
+        rescue Exception => e
+            STDERR.puts "Error reading template."
+            exit -1
+        end
+
+        helper.perform_action(args[0], options, "Updating VM configuration") do |vm|
+            if template.empty?
+                vm.info
+
+                template = vm.template_like_str('TEMPLATE', true,
+                           'OS | FEATURES | INPUT | GRAPHICS | RAW | CONTEXT')
+                template = OpenNebulaHelper::editor_input(template)
+            end
+
+            vm.updateconf(template)
+        end
+    end
+
     # Deprecated commands
 
-    deprecated_command(:attachdisk, 'disk-attach')
-    deprecated_command(:detachdisk, 'disk-detach')
-    deprecated_command(:'disk-snapshot', 'disk-saveas')
-    deprecated_command(:livemigrate, 'migrate --live')
-    deprecated_command(:cancel, 'shutdown --hard')
-    deprecated_command(:reset, 'reboot --hard')
-    deprecated_command(:restart, 'recover --retry')
-    deprecated_command(:boot, 'recover --retry')
-    deprecated_command(:resubmit, 'delete --recreate')
+    deprecated_command(:shutdown, 'terminate')
+    deprecated_command(:delete, 'recover')
 end

data/bin/onevnet

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -148,9 +148,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 ar << ", ULA_PREFIX = " <<
                       options[:ip6_ula] if options[:ip6_ula]
                 ar << ", GATEWAY = " << options[:gateway] if options[:gateway]
-                ar << ", MASK = " << options[:netmask] if options[:netmask]
-                ar << ", VLAN = YES" if options[:vlan]
-                ar << ", VLAN_ID = " << options[:vlanid] if options[:vlanid]
+                ar << ", MASK = "    << options[:netmask] if options[:netmask]
+                ar << ", VN_MAD = "  << options[:vn_mad]  if options[:vn_mad]
+                ar << ", VLAN_ID = " << options[:vlanid]  if options[:vlanid]
 
                 ar << "]"
             end
@@ -329,6 +329,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
@@ -365,6 +368,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             str = OpenNebulaHelper.update_template_helper(false, args[0], obj,
                 args[2], "AR_POOL", false)
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update_ar(str)
         end
     end