opennebula-cli 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4908cbc17aac8f9c51ea753a53ae639ae001ffafd53e434de2607dbeca48a17
-  data.tar.gz: b8177017450198bf4c1a37a0239568c090c8ed8c1527cd5de04079ceb72a6f6a
+  metadata.gz: 3e2632af598a5b133b2a79d76411771bb13729b53cb61e13ca2fdc9a19d03537
+  data.tar.gz: 80e5897f9689d6d8c40f409b99df4432378693529cca5acae1fb5bc4aa28b45f
 SHA512:
-  metadata.gz: e1768f1cfaf3e35b24c0ea83e646d86fe4d02363ca9d9e96e8b9f7e41f8ca4405e81728d1b95284660579a02b01041253f4f1c56a93ef5ebc4a7fb4966730134
-  data.tar.gz: a089348845dc43030ae6e079c8d71d8a0abc1978dd369bddebaf718d42ad7be24e476308d622e47673d906e387a2465055a64d1117ff1cbc48d04abf9e35cb47
+  metadata.gz: 77b4013137e6fb74bff4aa984e33cbfe4cebdb8370e29be5bc8513446d6104c57e72a7d47cfde42ed9b4bbe514ed3387b14cc264939a7b7cc2ddf7324644b429
+  data.tar.gz: bf7615319dcc7119541276b06ab97ab904ad5dce0ebb93b1ffe2eca4111df24b13540051f3e66a133fbefae9d4a1ce971d9594a95c593d458f2b130ae109b86f

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/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}"

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
     ########################################################################
@@ -1394,16 +1398,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/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,

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/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>

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.1
+  version: 6.2.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.2.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement