opennebula-cli 6.2.0 → 6.3.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b9047abc8d9178fcb286d57d5b78011953ac28b9
-  data.tar.gz: ed6331618ee88c1858ca45686a3e618347177301
+SHA256:
+  metadata.gz: 5a1350ce7a3d5d9d6e1b7ffb16f51eaecdf01cd397fa8d1bb0fb87f08b5c0fc4
+  data.tar.gz: fb950f30366562c94cd865adffeae41d7442cf70e20a7ab035c8a40cbb6aec3e
 SHA512:
-  metadata.gz: cc9036cd78ef6b9f679d3b572b84e953687f4c1e67efa7c3b82da2010536d84274a309318edc576abc81e58c9662a87c23605d719d9dd059bc13a7c0cc2896cf
-  data.tar.gz: b74774142ddff00b508f990c63c575743493a7e8d7728d117dd46f27705e22143ff9f5180a8cbcd13b3127cfec6ba409a824857e7cdfc4206faae98654d21b03
+  metadata.gz: c5d582717725a0da69269abe94e4fb07f429ac58286116a3bf165833c9e894505370fbaf4ca2b7d3d9ebfe26c2c927d8e4a1848c014db13c45550c0d1af9ec8a
+  data.tar.gz: 34127cec5cc3eaf71dc8e4dc479a05d3f5f0760b99725f99c0155a37986d7477ec3879298d11153d79559c091075f698d04145b2d35d86898d63e85aeb017a6a

data/bin/onehook

@@ -256,8 +256,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a Hook with differents levels for lock any actions with this Hook,
-        show and monitoring never will be locked.
+        Locks a Hook to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.

data/bin/onehost

@@ -109,6 +109,20 @@ CommandParser::CmdParser.new(ARGV) do
         :format => String
     }
 
+    IPV4 = {
+        :name  => 'ipv4',
+        :large => '--ipv4 ip1,ip2',
+        :description => 'Comma separated IPV4 to set',
+        :format => Array
+    }
+
+    IPV6 = {
+        :name  => 'ipv6',
+        :large => '--ipv6 ip1,ip2',
+        :description => 'Comma separated IPV6 to set',
+        :format => Array
+    }
+
     CREAT_OPTIONS = [IM, VMM, OneClusterHelper::CLUSTER, TYPE]
     SYNC_OPTIONS  = [OneClusterHelper::CLUSTER, FORCE, SSH]
 
@@ -344,12 +358,16 @@ CommandParser::CmdParser.new(ARGV) do
         Import VM to OpenNebula
     EOT
 
-    command :importvm, importvm_desc, :hostid, :name do
+    command :importvm,
+            importvm_desc,
+            :hostid,
+            :name,
+            :options => [IPV4, IPV6] do
         helper.perform_action(args[0], options, 'imported') do |o|
             rc = o.info
             next rc if OpenNebula.is_error?(rc)
 
-            o.import_wild(args[1])
+            o.import_wild(args[1], options[:ipv4], options[:ipv6])
         end
     end
 

data/bin/oneimage

@@ -159,7 +159,7 @@ CommandParser::CmdParser.new(ARGV) do
           - new persistent image, OS type and qcow2 format:
 
             oneimage create -d 1 --name ubuntu --path /tmp/ubuntu.qcow2 \\
-                            --prefix sd --type OS --driver qcow2 \\
+                            --prefix sd --type OS --format qcow2 \\
                             --description "A OS plain installation" \\
                             --persistent
 
@@ -436,8 +436,8 @@ CommandParser::CmdParser.new(ARGV) do
     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.
+        Locks an Image to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -464,7 +464,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks an Image.
         Valid states are: All.
     EOT
 

data/bin/onemarketapp

@@ -309,7 +309,7 @@ CommandParser::CmdParser.new(ARGV) do
                 puts key.to_s.upcase
                 value.each do |id|
                     if OpenNebula.is_error?(id)
-                        puts id.to_str
+                        STDERR.puts id.to_str
                         exit(-1)
                     else
                         puts "    ID: #{id}"
@@ -440,8 +440,8 @@ CommandParser::CmdParser.new(ARGV) do
     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.
+        Locks a marketplace app to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -470,7 +470,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a marketplace app.
         Valid states are: All.
     EOT
 

data/bin/onetemplate

@@ -406,8 +406,8 @@ CommandParser::CmdParser.new(ARGV) do
     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.
+        Locks a Template to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -434,7 +434,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a Template.
         Valid states are: All.
     EOT
 

data/bin/oneuser

@@ -573,7 +573,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, [:userid, nil],
-            :options => OpenNebulaHelper::FORMAT do
+            :options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::DECRYPT] do
         user = args[0] || OpenNebula::User::SELF
         helper.show_resource(user, options)
     end

data/bin/onevcenter

@@ -66,17 +66,56 @@ CommandParser::CmdParser.new(ARGV) do
         helper.set_client(options)
     end
 
+    ############################################################################
+    # Authentication Options
+    ############################################################################
+
+    VCENTER = {
+        :name  => 'vcenter',
+        :large => '--vcenter vCenter',
+        :description => 'The vCenter hostname',
+        :format => String
+    }
+
+    USER = {
+        :name  => 'vuser',
+        :large => '--vuser username',
+        :description => 'The username to interact with vCenter',
+        :format => String
+    }
+
+    PASS = {
+        :name  => 'vpass',
+        :large => '--vpass password',
+        :description => 'The password for the user',
+        :format => String
+    }
+
+    PORT = {
+        :name  => 'port',
+        :short => '-p port',
+        :large => '--port port',
+        :format => String,
+        :description => 'vCenter API port, defaults to 443 (SSL) or 80'
+    }
+
+    AUTH_OPTS = [VCENTER, USER, PASS, PORT]
+
+    ############################################################################
+    # List & Import
+    ############################################################################
+
     OBJECT = {
-        :name => 'object',
+        :name  => 'object',
         :short => '-o object',
         :large => '--object object ',
         :format => String,
         :description => 'vCenter object: [datastores, templates,'\
-                        'networks, datastores, images]'
+                        'networks, datastores, images, hosts]'
     }
 
     HOST = {
-        :name => 'host',
+        :name  => 'host',
         :short => '-h host_id',
         :large => '--host host_id',
         :format => String,
@@ -84,7 +123,7 @@ CommandParser::CmdParser.new(ARGV) do
     }
 
     DATASTORE = {
-        :name => 'datastore',
+        :name  => 'datastore',
         :short => '-d datastore_id',
         :large => '--datastore datastore_id',
         :format => String,
@@ -92,55 +131,63 @@ CommandParser::CmdParser.new(ARGV) do
     }
 
     CONFIG = {
-        :name => 'configuration',
+        :name  => 'configuration',
         :large => '--config file',
         :format => String,
         :description => 'Configuration file for custom options'
     }
 
-    VCENTER = {
-        :name => 'vcenter',
-        :large => '--vcenter vCenter',
-        :description => 'The vCenter hostname',
-        :format => String
+    LINKED_CLONE = {
+        :name  => 'linked_clone',
+        :large => '--linked_clone linked_clone',
+        :format => String,
+        :description => 'Import template as linked clone, 0/1'
     }
 
-    USER = {
-        :name => 'vuser',
-        :large => '--vuser username',
-        :description => 'The username to interact with vCenter',
-        :format => String
+    COPY = {
+        :name  => 'copy',
+        :large => '--copy copy',
+        :format => String,
+        :description => 'Import template as copy, 0/1'
     }
 
-    PASS = {
-        :name => 'vpass',
-        :large => '--vpass password',
-        :description => 'The password for the user',
-        :format => String
+    NAME = {
+        :name  => 'name',
+        :large => '--name name',
+        :format => String,
+        :description => 'Import template copy with name'
     }
 
-    PORT = {
-        :name => 'port',
-        :short => '-p port',
-        :large => '--port port',
+    FOLDER = {
+        :name  => 'folder',
+        :large => '--folder folder',
         :format => String,
-        :description => 'vCenter API port, defaults to 443 (SSL) or 80'
+        :description => 'Import template in folder'
     }
 
     USE_DEFAULTS = {
-        :name => 'defaults',
+        :name  => 'defaults',
         :large => '--use-defaults',
         :description => 'Use defaults for answers to questions',
         :format => String
     }
 
     ALL = {
-        :name => 'all',
+        :name  => 'all',
         :large => '--all',
         :description => 'Import all list',
         :format => String
     }
 
+    CLUSTER_REF = {
+        :name  => 'cluster_ref',
+        :large => '--cluster-ref cluster_ref',
+        :format => String,
+        :description => 'Cluster ref to import'
+    }
+
+    LIST_OPTS = [OBJECT, HOST, DATASTORE, CLIHelper::CSV_OPT] + AUTH_OPTS
+
     ############################################################################
     # Global Options
     ############################################################################
@@ -161,29 +208,26 @@ CommandParser::CmdParser.new(ARGV) do
            - listing available images:
 
              onevcenter list -o datastores -h <host_id> -d <ds-img_id>
+
+           - listing available clusters:
+
+             onevcenter list -o hosts --vcenter <IP> --vuser <U> --vpass <P>
     EOT
 
-    command :list,
-            list_desc,
-            :options => [OBJECT, HOST, DATASTORE, VCENTER, USER, PASS,
-                         CLIHelper::CSV_OPT] do
+    command :list, list_desc, :options => LIST_OPTS do
         begin
             args = helper.parse_opts(options)
-            args[:filter] = true
-            args[:short] = true
-            vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
-            importer = VCenterDriver::VcImporter
-                       .new_child(helper.client, vi_client, options[:object])
 
-            list = importer.retrieve_resources(args)
+            args[:filter] = true
+            args[:short]  = true
 
-            helper.list_object(options, list)
+            helper.list(options, args)
         rescue StandardError => e
             STDERR.puts e.message
             exit 1
         end
 
-        exit 0
+        0
     end
 
     list_desc = <<-EOT.unindent
@@ -193,29 +237,22 @@ CommandParser::CmdParser.new(ARGV) do
           - listing networks including uplinks:
 
             onevcenter list_all -o networks -h <host_id>
-
     EOT
 
-    command :list_all,
-            list_desc,
-            :options => [OBJECT, HOST, DATASTORE, VCENTER, USER, PASS] do
+    command :list_all, list_desc, :options => LIST_OPTS do
         begin
             args = helper.parse_opts(options)
-            args[:filter] = false
-            args[:short] = true
-            vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
-            importer = VCenterDriver::VcImporter
-                       .new_child(helper.client, vi_client, options[:object])
 
-            list = importer.retrieve_resources(args)
+            args[:filter] = false
+            args[:short]  = true
 
-            helper.list_object(options, list)
+            helper.list(options, args)
         rescue StandardError => e
             STDERR.puts e.message
             exit 1
         end
 
-        exit 0
+        0
     end
 
     import_desc = <<-EOT.unindent
@@ -236,21 +273,22 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :import,
-            import_desc, [:oid, nil],
+            import_desc,
+            [:oid, nil],
             :options => [OBJECT, HOST, DATASTORE] do
         begin
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
-            importer = VCenterDriver::VcImporter.new_child(helper.client,
-                                                           vi_client,
-                                                           options[:object])
+            importer  = VCenterDriver::VcImporter.new_child(helper.client,
+                                                            vi_client,
+                                                            options[:object])
 
             importer.retrieve_resources(helper.parse_opts(options))
             indexes = importer.get_indexes(args.first)
 
             if indexes.nil?
                 raise "Could not get any unimported #{options[:object]}"\
-                    " resources info in host: #{options[:host]} with"\
-                    " this input: #{args.first}"
+                      " resources info in host: #{options[:host]} with"\
+                      " this input: #{args.first}"
             end
 
             importer.process_import(indexes, options) do |object_info|
@@ -263,18 +301,25 @@ CommandParser::CmdParser.new(ARGV) do
             exit 1
         end
 
-        exit 0
+        0
     end
 
     command :import_defaults,
             import_desc,
             [:oid, nil],
-            :options => [OBJECT, HOST, DATASTORE, CONFIG] do
+            :options => [OBJECT,
+                         HOST,
+                         DATASTORE,
+                         CONFIG,
+                         FOLDER,
+                         LINKED_CLONE,
+                         COPY,
+                         NAME] do
         begin
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
-            importer = VCenterDriver::VcImporter.new_child(helper.client,
-                                                           vi_client,
-                                                           options[:object])
+            importer  = VCenterDriver::VcImporter.new_child(helper.client,
+                                                            vi_client,
+                                                            options[:object])
 
             if options[:object] == 'networks' && !args.first.nil?
                 indexes = args.first
@@ -283,15 +328,36 @@ CommandParser::CmdParser.new(ARGV) do
                 indexes = importer.get_indexes(args.first)
             end
 
-            importer.process_import(indexes, options)
+            if options[:object] == 'templates' &&
+               indexes &&
+               indexes.split(',').length == 1
+                opts = {
+                    :type         => 'default',
+                    :linked_clone => '0',
+                    :copy         => '0',
+                    :name         => '',
+                    :folder       => ''
+                }
+
+                if options[:linked_clone]
+                    opts[:linked_clone] = options[:linked_clone]
+                end
+
+                opts[:copy]   = options[:copy] if options[:copy]
+                opts[:name]   = options[:name] if options[:name]
+                opts[:folder] = options[:folder] if options[:folder]
+
+                options[indexes] = opts
+            end
 
+            importer.process_import(indexes, options)
             importer.stdout
         rescue StandardError => e
             STDERR.puts e.message
             exit 1
         end
 
-        exit 0
+        0
     end
 
     ############################################################################
@@ -303,11 +369,12 @@ CommandParser::CmdParser.new(ARGV) do
         Example:
            - Get available clusters:
 
-             onevcenter hosts --vcenter <vcenter> --vuser <vcenter_user> --vpass <password>
+             onevcenter hosts --vcenter <vcenter> --vuser <user> --vpass <pass>
     EOT
+
     command :hosts,
             host_desc,
-            :options => [VCENTER, USER, PASS, USE_DEFAULTS, PORT] do
+            :options => [CLUSTER_REF, USE_DEFAULTS] + AUTH_OPTS do
         con_ops = helper.connection_options('Hosts', options)
 
         begin
@@ -316,7 +383,7 @@ CommandParser::CmdParser.new(ARGV) do
             exit 1
         end
 
-        exit 0
+        0
     end
 
     ############################################################################
@@ -331,8 +398,9 @@ CommandParser::CmdParser.new(ARGV) do
 
            onevcenter cleargs 15
     EOT
+
     command :cleartags, cleartags_desc, :vmid do
-        vmid = args[0]
+        vmid       = args[0]
         remove_str = "\n        onevm recover --delete-db #{vmid}" \
                      "\n\nAfter a monitoring cycle, the VM will appear "\
                      'as a Wild VM for reimport.'
@@ -349,8 +417,8 @@ CommandParser::CmdParser.new(ARGV) do
                 puts remove_str
                 exit 0
             end
-            puts '.'
 
+            puts '.'
             puts 'The following keys will be removed:'
             keys.each {|key| puts "\t- #{key}" }
 
@@ -359,8 +427,10 @@ CommandParser::CmdParser.new(ARGV) do
             STDERR.puts "Couldn't clear VM tags. Reason: #{e.message}"
             exit 1
         end
+
         puts "\nKeys removed from VM. Is safe to remove it"
         puts remove_str
-        exit 0
+
+        0
     end
 end

data/bin/onevm

@@ -239,6 +239,10 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'SSH options to use'
     }
 
+    OpenNebulaHelper::TEMPLATE_OPTIONS_VM.delete_if do |v|
+        %w[as_gid as_uid].include?(v[:name])
+    end
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -909,6 +913,36 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    sg_attach_desc = <<-EOT.unindent
+        Attaches a Security Group to a VM.
+
+        States: All, except BOOT, MIGRATE and HOTPLUG_NIC
+    EOT
+
+    command :"sg-attach", sg_attach_desc, :vmid, :nicid, :sgid do
+        nic_id = args[1].to_i
+        sg_id = args[2].to_i
+
+        helper.perform_action(args[0], options, 'Attach SG') do |vm|
+            vm.sg_attach(nic_id, sg_id)
+        end
+    end
+
+    sg_detach_desc = <<-EOT.unindent
+        Detaches a Security Group from a VM.
+
+        States: All, except BOOT, MIGRATE and HOTPLUG_NIC
+    EOT
+
+    command :"sg-detach", sg_detach_desc, :vmid, :nicid, :sgid do
+        nic_id = args[1].to_i
+        sg_id = args[2].to_i
+
+        helper.perform_action(args[0], options, 'Detach SG') do |vm|
+            vm.sg_detach(nic_id, sg_id)
+        end
+    end
+
     chgrp_desc = <<-EOT.unindent
         Changes the VM group
     EOT
@@ -1338,9 +1372,12 @@ CommandParser::CmdParser.new(ARGV) do
     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.
+        Locks a VM to prevent certain actions defined by different levels.
+        The show and monitoring action will never be locked.
         Valid states are: All.
+        [Use]: locks Admin, Manage and Use actions.
+        [Manage]: locks Manage and Use actions.
+        [Admin]: locks only Admin actions.
     EOT
 
     command :lock, lock_desc, [:range, :vmid_list],
@@ -1362,7 +1399,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a Virtual Machine.
         Valid states are: All.
     EOT
 
@@ -1391,16 +1428,22 @@ CommandParser::CmdParser.new(ARGV) do
         acc_t = 0
         acc_w = 0
 
-        charters.each do |action, time|
-            sched = "+#{time[:time].to_i + acc_t}"
+        helper.perform_action(args[0], {}, 'Charter added') do |vm|
+            vm.info
+
+            diff_stime = Time.now.to_i - vm['/VM/STIME'].to_i
 
-            helper.schedule_actions([args[0]].flatten,
-                                    { :schedule => sched },
-                                    action.to_s,
-                                    time[:warning][:time] + acc_w)
+            charters.each do |action, time|
+                sched = "+#{time[:time].to_i + acc_t + diff_stime}"
 
-            acc_t += time[:time].to_i
-            acc_w += time[:warning][:time].to_i
+                helper.schedule_actions([args[0]].flatten,
+                                        { :schedule => sched },
+                                        action.to_s,
+                                        time[:warning][:time] + acc_w)
+
+                acc_t += time[:time].to_i
+                acc_w += time[:warning][:time].to_i
+            end
         end
 
         0

data/bin/onevmgroup

@@ -233,8 +233,8 @@ CommandParser::CmdParser.new(ARGV) do
     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.
+        Locks a VM Group to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -261,7 +261,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a VM Group.
         Valid states are: All.
     EOT
 

data/bin/onevnet

@@ -381,8 +381,8 @@ CommandParser::CmdParser.new(ARGV) do
     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.
+        Locks a Virtual Network to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -409,7 +409,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a Virtual Network.
         Valid states are: All.
     EOT
 

data/bin/onevntemplate

@@ -341,8 +341,8 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     lock_desc = <<-EOT.unindent
-        Locks a VN template with differents levels for lock any actions with this VN template,
-        show and monitoring never will be locked.
+        Locks a VN Template to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -369,7 +369,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VN template for unlock any actions with this VN template.
+        Unlocks a VN Template.
         Valid states are: All.
     EOT
 

data/bin/onevrouter

@@ -366,8 +366,8 @@ CommandParser::CmdParser.new(ARGV) do
     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.
+        Locks a Virtual Router to prevent certain actions defined by different levels.
+        The show action will never be locked.
         Valid states are: All.
         Levels:
         [Use]: locks Admin, Manage and Use actions.
@@ -394,7 +394,7 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     unlock_desc = <<-EOT.unindent
-        Unlocks a VM for unlock any actions with this VM.
+        Unlocks a Virtual Router.
         valid states are: All.
     EOT
 

data/lib/cli_helper.rb

@@ -61,7 +61,8 @@ module CLIHelper
                         ' ' * 31 << 'column=value pairs.' <<
                         ' ' * 31 << "Valid operators #{FILTER_OPS.join(',')}" <<
                         ' ' * 31 << 'e.g. NAME=test (match name with test)' <<
-                        ' ' * 31 << 'NAME~test (match test, te, tes..)'
+                        ' ' * 31 << 'NAME~test (match every NAME containing' <<
+                        ' ' * 31 << 'the substring \'test\')'
     }
 
     OPERATOR = {

data/lib/one_helper/onevcenter_helper.rb

@@ -27,9 +27,10 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
     module VOBJECT
 
         DATASTORE = 1
-        TEMPLATE = 2
-        NETWORK = 3
-        IMAGE = 4
+        TEMPLATE  = 2
+        NETWORK   = 3
+        IMAGE     = 4
+        HOST      = 5
 
     end
 
@@ -85,6 +86,12 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
             :columns => { :IMID => 5, :REF => 35, :PATH => 60 },
             :cli     => [:host, :datastore],
             :dialogue => ->(arg) {}
+        },
+        VOBJECT::HOST => {
+            :struct  => %w[HOST_LIST HOST],
+            :columns => { :DATACENTER => 10, :NAME => 30, :REF => 35 },
+            :cli     => [],
+            :dialogue => ->(arg) {}
         }
     }
 
@@ -143,6 +150,8 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
             @vobject = VOBJECT::NETWORK
         when 'images'
             @vobject = VOBJECT::IMAGE
+        when 'hosts'
+            @vobject = VOBJECT::HOST
         else
             puts "unknown #{type} type option"
             puts '  -o options:'
@@ -150,6 +159,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
             puts '      templates'
             puts '      networks'
             puts '      images'
+            puts '      hosts'
 
             exit 0
         end
@@ -186,6 +196,28 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
         }
     end
 
+    # General method to list vCenter objects
+    #
+    # @param options [Hash] User CLI options
+    # @param args    [Hash] Search arguments
+    def list(options, args)
+        if !options[:host]
+            # This case is to list available hosts, instead other object
+            list_hosts(options)
+        else
+            vi_client = VCenterDriver::VIClient.new_from_host(
+                options[:host]
+            )
+            importer = VCenterDriver::VcImporter.new_child(
+                @client,
+                vi_client,
+                options[:object]
+            )
+
+            list_object(options, importer.retrieve_resources(args))
+        end
+    end
+
     # This method will print a list for a vcenter_resource.
     #
     def list_object(options, list)
@@ -198,6 +230,31 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
         table.show(list, options)
     end
 
+    # List unimported hosts
+    #
+    # @param options [Hash] User CLI options
+    def list_hosts(options)
+        con_ops   = connection_options('hosts', options)
+        vi_client = VCenterDriver::VIClient.new(con_ops)
+        dc_folder = VCenterDriver::DatacenterFolder.new(vi_client)
+        hpool     = VCenterDriver::VIHelper.one_pool(OpenNebula::HostPool,
+                                                     false)
+
+        VCenterDriver::VIHelper.set_client(nil, @client)
+
+        list  = []
+        hosts = dc_folder.get_unimported_hosts(hpool, vi_client.vim.host)
+
+        hosts.each do |key, value|
+            value.each do |v|
+                v[:datacenter] = key
+                list << v
+            end
+        end
+
+        format_list.show(hosts, options)
+    end
+
     # handles :cli section of TABLE
     # used for executing the dialogue in some VOBJECTS
     #
@@ -252,12 +309,18 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
     def format_list
         config = TABLE[@vobject][:columns]
         CLIHelper::ShowTable.new do
+            column :DATACENTER,
+                   'Object datacenter',
+                   :size => config[:DATACENTER] || 15 do |d|
+                d[:datacenter]
+            end
+
             column :IMID, 'identifier for ...', :size=>config[:IMID] || 4 do |d|
                 d[:import_id]
             end
 
             column :REF, 'ref', :left, :adjust, :size=>config[:REF] || 15 do |d|
-                d[:ref]
+                d[:ref] || d[:cluster_ref]
             end
 
             column :NAME, 'Name', :left, :expand,
@@ -493,10 +556,11 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
 
         keys_to_remove = []
         vm['config.extraConfig'].each do |extraconfig|
-            if extraconfig.key.include?('opennebula.disk') ||
-               extraconfig.key.include?('opennebula.vm')
-                keys_to_remove << extraconfig.key
-            end
+            next unless extraconfig.key.include?('opennebula.disk') ||
+               extraconfig.key.include?('opennebula.vm') ||
+               extraconfig.key.downcase.include?('remotedisplay')
+
+            keys_to_remove << extraconfig.key
         end
 
         [vm, keys_to_remove]

data/lib/one_helper/onezone_helper.rb

@@ -577,7 +577,23 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
             puts "Endpoint changed to \"#{zone['TEMPLATE/ENDPOINT']}\" in " <<
                 "#{ENV['HOME']}/.one/one_endpoint"
         end
-        return 0
+
+        return 0 unless zone['TEMPLATE/ONEFLOW_ENDPOINT']
+
+        # Set ONEFLOW_ENDPOINT
+        if temporary_zone
+            puts "Type: export ONEFLOW_URL=#{zone['TEMPLATE/ONEFLOW_ENDPOINT']}"
+        else
+            File.open(ENV['HOME'] + '/.one/oneflow_endpoint', 'w') do |f|
+                f.puts zone['TEMPLATE/ONEFLOW_ENDPOINT']
+            end
+
+            puts 'OneFlow Endpoint changed to ' \
+                 "\"#{zone['TEMPLATE/ONEFLOW_ENDPOINT']}\" in " <<
+                 "#{ENV['HOME']}/.one/oneflow_endpoint"
+        end
+
+        0
     end
 
     private

data/share/schemas/xsd/opennebula_configuration.xsd

@@ -204,6 +204,7 @@
             <xs:all>
               <xs:element name="DEBUG_LEVEL" type="xs:integer"/>
               <xs:element name="SYSTEM" type="xs:string"/>
+              <xs:element name="USE_VMS_LOCATION" type="xs:string" minOccurs="0" maxOccurs="1"/>
             </xs:all>
           </xs:complexType>
         </xs:element>
@@ -303,6 +304,7 @@
           </xs:complexType>
         </xs:element>
 
+        <xs:element name="USER_ENCRYPTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element name="USER_RESTRICTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
 
         <xs:element name="VLAN_IDS" minOccurs="0" maxOccurs="1">
@@ -366,6 +368,7 @@
         <xs:element name="VM_MANAGE_OPERATIONS" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="VM_MONITORING_EXPIRATION_TIME" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element name="VM_RESTRICTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element name="VM_SNAPSHOT_FACTOR" type="xs:string" minOccurs="0" maxOccurs="1"/>
 
         <xs:element name="VM_SUBMIT_ON_HOLD" minOccurs="0" maxOccurs="1">
           <xs:simpleType>

data/share/schemas/xsd/vm.xsd

@@ -121,7 +121,6 @@
               <xs:element name="MEMORY" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="MEMORY_COST" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="MEMORY_MAX" type="xs:string" minOccurs="0" maxOccurs="1"/>
-              <xs:element name="MEMORY_SLOTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                   <xs:sequence>
@@ -167,6 +166,19 @@
                 </xs:complexType>
               </xs:element>
               <xs:element name="SECURITY_GROUP_RULE" minOccurs="0" maxOccurs="unbounded"/>
+              <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ACTION" type="xs:string"  minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="ACTIVE" type="xs:string"  minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="HYPERVISOR_ID" type="xs:string"/>
+                    <xs:element name="NAME" type="xs:string"/>
+                    <xs:element name="SNAPSHOT_ID" type="xs:string"/>
+                    <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
+                    <xs:element name="TIME" type="xs:string"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
               <xs:element name="SPICE_OPTIONS" minOccurs="0" maxOccurs="1"/>
               <xs:element name="SUBMIT_ON_HOLD" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="TEMPLATE_ID" type="xs:string"  minOccurs="0" maxOccurs="1"/>

data/share/schemas/xsd/vm_pool.xsd

@@ -75,6 +75,8 @@
                           <xs:element name="HID" type="xs:integer"/>
                           <xs:element name="CID" type="xs:integer"/>
                           <xs:element name="DS_ID" type="xs:integer"/>
+                          <xs:element name="VM_MAD" type="xs:string"/>
+                          <xs:element name="TM_MAD" type="xs:string"/>
                           <xs:element name="ACTION" type="xs:integer"/>
                         </xs:sequence>
                       </xs:complexType>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,107 +16,60 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.3.80.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.3.80.pre
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables:
-- oneacct
-- oneacl
-- onecluster
-- onedatastore
-- oneflow
-- oneflow-template
+- onezone
+- onevcenter
+- oneimage
+- onevmgroup
+- onehost
 - onegroup
 - onehook
-- onehost
-- oneimage
-- onemarket
-- onemarketapp
-- onesecgroup
+- onevdc
+- oneacl
+- oneflow-template
+- onevrouter
 - oneshowback
-- onetemplate
 - oneuser
-- onevcenter
-- onevdc
-- onevm
-- onevmgroup
-- onevnet
+- oneacct
+- onesecgroup
+- onecluster
+- onemarketapp
+- onetemplate
+- onemarket
 - onevntemplate
-- onevrouter
-- onezone
+- onevnet
+- oneflow
+- onedatastore
+- onevm
 extensions: []
 extra_rdoc_files: []
 files:
-- share/schemas/xsd/acct.xsd
-- share/schemas/xsd/acl_pool.xsd
-- share/schemas/xsd/api_info.xsd
-- share/schemas/xsd/cluster.xsd
-- share/schemas/xsd/cluster_pool.xsd
-- share/schemas/xsd/datastore.xsd
-- share/schemas/xsd/datastore_pool.xsd
-- share/schemas/xsd/document.xsd
-- share/schemas/xsd/document_pool.xsd
-- share/schemas/xsd/group.xsd
-- share/schemas/xsd/group_pool.xsd
-- share/schemas/xsd/hook.xsd
-- share/schemas/xsd/hook_message_api.xsd
-- share/schemas/xsd/hook_message_retry.xsd
-- share/schemas/xsd/hook_message_state.xsd
-- share/schemas/xsd/hook_pool.xsd
-- share/schemas/xsd/host.xsd
-- share/schemas/xsd/host_pool.xsd
-- share/schemas/xsd/image.xsd
-- share/schemas/xsd/image_pool.xsd
-- share/schemas/xsd/index.xsd
-- share/schemas/xsd/marketplace.xsd
-- share/schemas/xsd/marketplace_pool.xsd
-- share/schemas/xsd/marketplaceapp.xsd
-- share/schemas/xsd/marketplaceapp_pool.xsd
-- share/schemas/xsd/monitoring_data.xsd
-- share/schemas/xsd/opennebula_configuration.xsd
-- share/schemas/xsd/raftstatus.xsd
-- share/schemas/xsd/security_group.xsd
-- share/schemas/xsd/security_group_pool.xsd
-- share/schemas/xsd/showback.xsd
-- share/schemas/xsd/user.xsd
-- share/schemas/xsd/user_pool.xsd
-- share/schemas/xsd/vdc.xsd
-- share/schemas/xsd/vdc_pool.xsd
-- share/schemas/xsd/vm.xsd
-- share/schemas/xsd/vm_group.xsd
-- share/schemas/xsd/vm_group_pool.xsd
-- share/schemas/xsd/vm_pool.xsd
-- share/schemas/xsd/vmtemplate.xsd
-- share/schemas/xsd/vmtemplate_pool.xsd
-- share/schemas/xsd/vnet.xsd
-- share/schemas/xsd/vnet_pool.xsd
-- share/schemas/xsd/vntemplate.xsd
-- share/schemas/xsd/vntemplate_pool.xsd
-- share/schemas/xsd/vrouter.xsd
-- share/schemas/xsd/vrouter_pool.xsd
-- share/schemas/xsd/zone.xsd
-- share/schemas/xsd/zone_pool.xsd
+- LICENSE
+- NOTICE
 - bin/oneacct
 - bin/oneacl
 - bin/onecluster
@@ -168,8 +121,55 @@ files:
 - lib/one_helper/onevntemplate_helper.rb
 - lib/one_helper/onevrouter_helper.rb
 - lib/one_helper/onezone_helper.rb
-- NOTICE
-- LICENSE
+- share/schemas/xsd/acct.xsd
+- share/schemas/xsd/acl_pool.xsd
+- share/schemas/xsd/api_info.xsd
+- share/schemas/xsd/cluster.xsd
+- share/schemas/xsd/cluster_pool.xsd
+- share/schemas/xsd/datastore.xsd
+- share/schemas/xsd/datastore_pool.xsd
+- share/schemas/xsd/document.xsd
+- share/schemas/xsd/document_pool.xsd
+- share/schemas/xsd/group.xsd
+- share/schemas/xsd/group_pool.xsd
+- share/schemas/xsd/hook.xsd
+- share/schemas/xsd/hook_message_api.xsd
+- share/schemas/xsd/hook_message_retry.xsd
+- share/schemas/xsd/hook_message_state.xsd
+- share/schemas/xsd/hook_pool.xsd
+- share/schemas/xsd/host.xsd
+- share/schemas/xsd/host_pool.xsd
+- share/schemas/xsd/image.xsd
+- share/schemas/xsd/image_pool.xsd
+- share/schemas/xsd/index.xsd
+- share/schemas/xsd/marketplace.xsd
+- share/schemas/xsd/marketplace_pool.xsd
+- share/schemas/xsd/marketplaceapp.xsd
+- share/schemas/xsd/marketplaceapp_pool.xsd
+- share/schemas/xsd/monitoring_data.xsd
+- share/schemas/xsd/opennebula_configuration.xsd
+- share/schemas/xsd/raftstatus.xsd
+- share/schemas/xsd/security_group.xsd
+- share/schemas/xsd/security_group_pool.xsd
+- share/schemas/xsd/showback.xsd
+- share/schemas/xsd/user.xsd
+- share/schemas/xsd/user_pool.xsd
+- share/schemas/xsd/vdc.xsd
+- share/schemas/xsd/vdc_pool.xsd
+- share/schemas/xsd/vm.xsd
+- share/schemas/xsd/vm_group.xsd
+- share/schemas/xsd/vm_group_pool.xsd
+- share/schemas/xsd/vm_pool.xsd
+- share/schemas/xsd/vmtemplate.xsd
+- share/schemas/xsd/vmtemplate_pool.xsd
+- share/schemas/xsd/vnet.xsd
+- share/schemas/xsd/vnet_pool.xsd
+- share/schemas/xsd/vntemplate.xsd
+- share/schemas/xsd/vntemplate_pool.xsd
+- share/schemas/xsd/vrouter.xsd
+- share/schemas/xsd/vrouter_pool.xsd
+- share/schemas/xsd/zone.xsd
+- share/schemas/xsd/zone_pool.xsd
 homepage: http://opennebula.io
 licenses:
 - Apache-2.0
@@ -180,17 +180,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: OpenNebula Command Line Interface