opennebula-cli 5.4.15 → 5.5.80.pre

data/bin/onevcenter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, 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    #
@@ -31,46 +31,51 @@ $: << RUBY_LIB_LOCATION+"/cli"
 $: << REMOTES_LOCATION+"vmm/vcenter/"
 
 require 'command_parser'
-require 'one_helper/onehost_helper'
-require 'one_helper/onecluster_helper'
+require 'one_helper/onevcenter_helper'
 require 'vcenter_driver'
 
-def connection_options(object_name, options)
-    if  options[:vuser].nil? ||
-        options[:vcenter].nil?
-        STDERR.puts "vCenter connection parameters are mandatory to import"\
-                    " #{object_name}:\n"\
-                    "\t --vcenter vCenter hostname\n"\
-                    "\t --vuser username to login in vcenter"
-        exit -1
-    end
-
-    password = options[:vpass] || OpenNebulaHelper::OneHelper.get_password
-
-    {
-       :user     => options[:vuser],
-       :password => password,
-       :host     => options[:vcenter]
-    }
-end
-
 cmd=CommandParser::CmdParser.new(ARGV) do
 
     usage "`onevcenter` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
-    helper = OneHostHelper.new
+    helper = OneVcenterHelper.new
 
     before_proc do
         helper.set_client(options)
     end
 
-    ############################################################################
-    # Global Options
-    ############################################################################
-    cmd_options=CommandParser::OPTIONS-[CommandParser::VERBOSE]
-    set :option, cmd_options+OpenNebulaHelper::CLIENT_OPTIONS
 
+    OBJECT = {
+        :name => "object",
+        :short => "-o object",
+        :large => "--object object ",
+        :format => String,
+        :description => "vCenter object"
+    }
+
+    HOST = {
+        :name => "host",
+        :short => "-h host_id",
+        :large => "--host host_id",
+        :format => String,
+        :description => "OpenNebula host used to authenticate the operation"
+    }
+
+    DATASTORE = {
+        :name => "datastore",
+        :short => "-d datastore_id",
+        :large => "--datastore datastore_id",
+        :format => String,
+        :description => "OpenNebula datastore used"
+    }
+
+    CONFIG = {
+        :name => "configuration",
+        :large => "--config file",
+        :format => String,
+        :description => "Configuration file for custom options"
+    }
 
     VCENTER = {
         :name   => "vcenter",
@@ -100,98 +105,102 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :format => String
     }
 
+    ALL = {
+        :name   => "all",
+        :large  => "--all",
+        :description => "Import all list",
+        :format => String
+    }
+
     ############################################################################
-    # Import clusters
+    # Global Options
     ############################################################################
-    hosts_desc = <<-EOT.unindent
-        Import vCenter clusters as OpenNebula hosts
-    EOT
-
-    command :hosts, hosts_desc, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
-        con_ops = connection_options("Hosts", options)
+    cmd_options=CommandParser::OPTIONS-[CommandParser::VERBOSE]
+    set :option, cmd_options+OpenNebulaHelper::CLIENT_OPTIONS
 
-        VCenterDriver::Importer.import_clusters(con_ops, options)
+    #format :oid, "vCenter Object identifier" do |arg|
+    #    puts arg
+    #end
 
-        exit 0
-    end
 
     ############################################################################
-    # Import templates
+    # list resources
     ############################################################################
-    templates_desc = <<-EOT.unindent
-        Import vCenter VM Templates into OpenNebula
+    list_desc = <<-EOT.unindent
+        Show a list with unimported vCenter objects
     EOT
 
-    command :templates, templates_desc, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
-        con_ops = connection_options("VM Templates", options)
+    command :list, list_desc, :options=>[ OBJECT, HOST, DATASTORE, VCENTER, USER, PASS ] do
+        begin
+            args = helper.parse_opts(options)
+            vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
+            importer = VCenterDriver::VcImporter.new_child(helper.client, vi_client, options[:object])
 
-        VCenterDriver::Importer.import_templates(con_ops, options)
+            list = importer.retrieve_resources(args)
+
+            helper.list_object(options, list)
+        rescue Exception => e
+            puts e.message
+        end
 
         exit 0
     end
 
-    ############################################################################
-    # Import vms (deprecated)
-    ############################################################################
-    vms_desc = <<-EOT.unindent
-        Deprecated action in onevcenter, please use onehost importvm instead
+    import_desc = <<-EOT.unindent
+        Import the the desired vCenter object
     EOT
 
-    command :vms, vms_desc, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
-        STDERR.puts "Deprecated action in onevcenter, please use onehost "\
-                    "importvm instead"
-        exit -1
-    end
+    command :import, import_desc, [:oid, nil], :options=>[ OBJECT, HOST, DATASTORE ] do
 
-    ############################################################################
-    # Import networks
-    ############################################################################
-    network_desc = <<-EOT.unindent
-        Import vCenter networks into OpenNebula
-    EOT
+        begin
+            vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
+            importer = VCenterDriver::VcImporter.new_child(helper.client, vi_client, options[:object])
+
+            importer.retrieve_resources(helper.parse_opts(options))
+            indexes = importer.get_indexes(args.first)
 
-    command :networks, network_desc, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
-        con_ops = connection_options("Networks", options)
+            importer.process_import(indexes) do |object_info|
+                helper.cli_dialogue(object_info)
+            end
 
-        VCenterDriver::Importer.import_networks(con_ops, options)
+            importer.stdout
+        rescue Exception => e
+            puts e.message
+        end
 
         exit 0
     end
 
-    ############################################################################
-    # Import datastores
-    ############################################################################
-    datastores_desc = <<-EOT.unindent
-        Import vCenter Datastores into OpenNebula
-    EOT
+    command :import_defaults, import_desc, [:oid, nil] , :options=>[ OBJECT, HOST, DATASTORE, CONFIG ] do
 
-    command :datastores, datastores_desc, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
-        con_ops = connection_options("Datastores", options)
+        begin
+            vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
+            importer = VCenterDriver::VcImporter.new_child(helper.client, vi_client, options[:object])
+            importer.retrieve_resources(helper.parse_opts(options))
+            indexes = importer.get_indexes(args.first)
 
-        VCenterDriver::Importer.import_datastore(con_ops, options)
+            importer.process_import(indexes)
+
+            importer.stdout
+        rescue Exception => e
+            puts e.message
+        end
 
         exit 0
     end
 
     ############################################################################
-    # Import images
+    # Import clusters
     ############################################################################
-    images_desc = <<-EOT.unindent
-        Import vCenter Images into OpenNebula
+    host_desc = <<-EOT.unindent
+        Import vCenter clusters as OpenNebula hosts
     EOT
+    command :hosts, host_desc, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
+        con_ops = helper.connection_options("Hosts", options)
 
-    command :images, images_desc, :ds_name, :options=>[ VCENTER, USER, PASS, USE_DEFAULTS ] do
-        ds_name = args[0]
-
-        if !ds_name
-            STDERR.puts "Datastore name needed to import images from"
-            exit -1
-        end
-
-        con_ops = connection_options("Images", options)
-
-        VCenterDriver::Importer.import_images(con_ops, ds_name, options)
+        VCenterDriver::Importer.import_clusters(con_ops, options)
 
         exit 0
     end
+
 end

data/bin/onevdc

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, 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    #

data/bin/onevm

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, 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    #
@@ -137,6 +137,30 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Make the new images persistent"
     }
 
+    USE={
+        :name  => "use",
+        :large => "--use",
+        :description => "lock use actions"
+    }
+
+    MANAGE={
+        :name  => "manage",
+        :large => "--manage",
+        :description => "lock manage actions"
+    }
+
+    ADMIN={
+        :name  => "admin",
+        :large => "--admin",
+        :description => "lock admin actions"
+    }
+
+    ALL={
+        :name  => "all",
+        :large => "--all",
+        :description => "lock all actions"
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -292,7 +316,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :hold, hold_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do
         if (!options[:schedule].nil?)
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -309,7 +333,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :release, release_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do
         if (!options[:schedule].nil?)
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -367,7 +391,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :terminate, terminate_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do
 
         command_name='terminate'
         command_name<<'-hard' if options[:hard]
@@ -390,7 +414,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :undeploy, undeploy_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do
 
         command_name='undeploy'
         command_name<<'-hard' if options[:hard]
@@ -412,7 +436,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :poweroff, poweroff_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do
 
         command_name='poweroff'
         command_name<<'-hard' if options[:hard]
@@ -436,7 +460,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :reboot, reboot_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME, OneVMHelper::HARD] do
 
         command_name='reboot'
         command_name<<'-hard' if options[:hard]
@@ -501,7 +525,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :stop, stop_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do
         if (!options[:schedule].nil?)
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -521,7 +545,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :suspend, suspend_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do
         if (!options[:schedule].nil?)
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -538,7 +562,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :resume, resume_desc, [:range,:vmid_list],
-        :options => [OneVMHelper::SCHEDULE] do
+        :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do
         if (!options[:schedule].nil?)
             helper.schedule_actions(args[0], options, @comm_name)
         else
@@ -780,7 +804,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"snapshot-create", snapshot_create_desc, [:range,:vmid_list],
-        [:name, nil], :options => [OneVMHelper::SCHEDULE] do
+        [:name, nil], :options => [OneVMHelper::SCHEDULE, OneVMHelper::WEEKLY, OneVMHelper::MONTHLY, OneVMHelper::YEARLY, OneVMHelper::HOURLY, OneVMHelper::END_TIME] do
 
         if (!options[:schedule].nil?)
             helper.schedule_actions(args[0], options, @comm_name)
@@ -855,6 +879,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     disk_resize_desc = <<-EOT.unindent
         Resizes a VM disk. The new size should be larger than the old one.
+        The valid units are:
+            - T: TiB
+            - G: GiB
+            - M: MiB
+            By default is MiB.
 
         States: RUNNING, POWEROFF
     EOT
@@ -996,6 +1025,41 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    lock_desc = <<-EOT.unindent
+        Locks a VM with differents levels for lock any actions with this VM, show and
+        monitoring never will be locked.
+        Aalid states are: All.
+    EOT
+
+    command :lock, lock_desc, :vmid,
+        :options => [USE, MANAGE, ADMIN, ALL] do
+        helper.perform_action(args[0],options,"VM locked") do |vm|
+            if !options[:use].nil?
+                level = 1
+            elsif !options[:manage].nil?
+                level = 2
+            elsif !options[:admin].nil?
+                level = 3
+            elsif !options[:all].nil?
+                level = 4
+            else
+                level = 1
+            end
+            vm.lock(level)
+        end
+    end
+
+    unlock_desc = <<-EOT.unindent
+        Unlocks a VM for unlock any actions with this VM.
+        Valid states are: All.
+    EOT
+
+    command :unlock, unlock_desc, :vmid do
+        helper.perform_action(args[0],options,"VM unlocked") do |vm|
+            vm.unlock
+        end
+    end
+
     # Deprecated commands
 
     deprecated_command(:shutdown, 'terminate')

data/bin/onevmgroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, 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    #
@@ -40,6 +40,30 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.set_client(options)
     end
 
+    USE={
+        :name  => "use",
+        :large => "--use",
+        :description => "lock use actions"
+    }
+
+    MANAGE={
+        :name  => "manage",
+        :large => "--manage",
+        :description => "lock manage actions"
+    }
+
+    ADMIN={
+        :name  => "admin",
+        :large => "--admin",
+        :description => "lock admin actions"
+    }
+
+    ALL={
+        :name  => "all",
+        :large => "--all",
+        :description => "lock all actions"
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -182,4 +206,43 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             o.rename(args[1])
         end
     end
+
+    lock_desc = <<-EOT.unindent
+        Locks a VM with differents levels for lock any actions with this VM, show and
+        monitoring never will be locked.
+        Valid states are: All.
+        Levels:
+        [Use]: locks Admin, Manage and Use actions.
+        [Manage]: locks Manage and Use actions.
+        [Admin]: locks only Admin actions.
+    EOT
+
+    command :lock, lock_desc, :vmgroupid,
+        :options => [USE, MANAGE, ADMIN, ALL] do
+        helper.perform_action(args[0],options,"VMGroup locked") do |vmg|
+            if !options[:use].nil?
+                level = 1
+            elsif !options[:manage].nil?
+                level = 2
+            elsif !options[:admin].nil?
+                level = 3
+            elsif !options[:all].nil?
+                level = 4
+            else
+                level = 1
+            end
+            vmg.lock(level)
+        end
+    end
+
+    unlock_desc = <<-EOT.unindent
+        Unlocks a VM for unlock any actions with this VM.
+        Valid states are: All.
+    EOT
+
+    command :unlock, unlock_desc, :vmgroupid do
+        helper.perform_action(args[0],options,"VMGroup unlocked") do |vmg|
+            vmg.unlock
+        end
+    end
 end

data/bin/onevnet

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, 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    #
@@ -41,6 +41,30 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.set_client(options)
     end
 
+    USE={
+        :name  => "use",
+        :large => "--use",
+        :description => "lock use actions"
+    }
+
+    MANAGE={
+        :name  => "manage",
+        :large => "--manage",
+        :description => "lock manage actions"
+    }
+
+    ADMIN={
+        :name  => "admin",
+        :large => "--admin",
+        :description => "lock admin actions"
+    }
+
+    ALL={
+        :name  => "all",
+        :large => "--all",
+        :description => "lock all actions"
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -422,4 +446,43 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             o.rename(args[1])
         end
     end
+
+    lock_desc = <<-EOT.unindent
+        Locks a VM with differents levels for lock any actions with this VM, show and
+        monitoring never will be locked.
+        Valid states are: All.
+        Levels:
+        [Use]: locks Admin, Manage and Use actions.
+        [Manage]: locks Manage and Use actions.
+        [Admin]: locks only Admin actions.
+    EOT
+
+    command :lock, lock_desc, :vnetid,
+        :options => [USE, MANAGE, ADMIN, ALL] do
+        helper.perform_action(args[0],options,"VNet locked") do |vnet|
+            if !options[:use].nil?
+                level = 1
+            elsif !options[:manage].nil?
+                level = 2
+            elsif !options[:admin].nil?
+                level = 3
+            elsif !options[:all].nil?
+                level = 4
+            else
+                level = 1
+            end
+            vnet.lock(level)
+        end
+    end
+
+    unlock_desc = <<-EOT.unindent
+        Unlocks a VM for unlock any actions with this VM.
+        Valid states are: All.
+    EOT
+
+    command :unlock, unlock_desc, :vnetid do
+        helper.perform_action(args[0],options,"VNet unlocked") do |vnet|
+            vnet.unlock
+        end
+    end
 end

data/bin/onevrouter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, 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    #
@@ -42,6 +42,30 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.set_client(options)
     end
 
+    USE={
+        :name  => "use",
+        :large => "--use",
+        :description => "lock use actions"
+    }
+
+    MANAGE={
+        :name  => "manage",
+        :large => "--manage",
+        :description => "lock manage actions"
+    }
+
+    ADMIN={
+        :name  => "admin",
+        :large => "--admin",
+        :description => "lock admin actions"
+    }
+
+    ALL={
+        :name  => "all",
+        :large => "--all",
+        :description => "lock all actions"
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -314,4 +338,43 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     command :top, top_desc, [:filterflag, nil], :options=>list_options do
         helper.list_pool(options, true, args[0])
     end
+
+    lock_desc = <<-EOT.unindent
+        Locks a VM with differents levels for lock any actions with this VM, show and
+        monitoring never will be locked.
+        Valid states are: All.
+        Levels:
+        [Use]: locks Admin, Manage and Use actions.
+        [Manage]: locks Manage and Use actions.
+        [Admin]: locks only Admin actions.
+    EOT
+
+    command :lock, lock_desc, :vrouterid,
+        :options => [USE, MANAGE, ADMIN, ALL] do
+        helper.perform_action(args[0],options,"VRouter locked") do |vr|
+            if !options[:use].nil?
+                level = 1
+            elsif !options[:manage].nil?
+                level = 2
+            elsif !options[:admin].nil?
+                level = 3
+            elsif !options[:all].nil?
+                level = 4
+            else
+                level = 1
+            end
+            vr.lock(level)
+        end
+    end
+
+    unlock_desc = <<-EOT.unindent
+        Unlocks a VM for unlock any actions with this VM.
+        valid states are: All.
+    EOT
+
+    command :unlock, unlock_desc, :vrouterid do
+        helper.perform_action(args[0],options,"VRouter unlocked") do |vr|
+            vr.unlock
+        end
+    end
 end