opennebula-cli 6.4.0 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56b346315b2634a821c776148d1e7e01aa05adfcdb3b4a2e367cae4a29b26857
-  data.tar.gz: 7046877fa9eb556c11b1dc21bcb27576ed801cb0e8ed6f55c50c3a6b72579ee2
+  metadata.gz: 003723be19ffff60bc9f577b306af83be5168c39be3be02913e3536c4b3abec8
+  data.tar.gz: 2c45d3c203e8efb33e3a446a8b36dc17d538ad528d79f4abe08e17cccf72374b
 SHA512:
-  metadata.gz: 3fc21ffc004d6e90f856f49b58164318b365653839009225b77d6074004f24da92d495d6f71669130c47b75648f744e31ae7ff412634198990ff7ec537856203
-  data.tar.gz: 1dc9aef9254b2ef752a9adea4c98f55aec7537842cd62f6fe88f3c8b09a89d0c38f6c2218af2d582e800fe7cc920672316d656e9543ab6d29b77a38c65704d95
+  metadata.gz: db8fce550c33714a7752f157bf8fb4ee75fb8c5ab30f4d195d3ed248f75e770f6ce96b9f87f4efd086cd051a5f92b711619dc0fd4909c8ee4494a3e67da364e6
+  data.tar.gz: da31372a0c1b47c0d6d85d27bb840c9a20ae3424306ed1d4580fb7aab1f1b4acbb1d8123dd45d15d9a9f4a65429c7dc66a841d8dfe0bc76dfdaac4f99f1a8244

data/bin/onedatastore

@@ -158,7 +158,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :datastoreid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |obj|
-            obj.chmod_octet(args[1])
+            obj.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/bin/oneflow

@@ -285,7 +285,7 @@ CommandParser::CmdParser.new(ARGV) do
 
         Service.perform_actions(args[0]) do |service_id|
             params = {}
-            params['octet'] = args[1]
+            params['octet'] = OpenNebulaHelper.to_octet(args[1])
 
             json = Service.build_json_action('chmod', params)
 

data/bin/oneflow-template

@@ -59,7 +59,6 @@ require 'tempfile'
 
 require 'command_parser'
 require 'opennebula/oneflow_client'
-require 'models'
 require 'cli_helper'
 require 'one_helper/oneflowtemplate_helper'
 
@@ -346,7 +345,7 @@ CommandParser::CmdParser.new(ARGV) do
 
         Service.perform_actions(args[0]) do |service_id|
             params = {}
-            params['octet'] = args[1]
+            params['octet'] = OpenNebulaHelper.to_octet(args[1])
 
             json = Service.build_json_action('chmod', params)
 

data/bin/oneimage

@@ -363,7 +363,7 @@ CommandParser::CmdParser.new(ARGV) do
     command :chmod, chmod_desc, [:range, :imageid_list], :octet do
         helper.perform_actions(args[0], options,
                                'Permissions changed') do |image|
-            image.chmod_octet(args[1])
+            image.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/bin/onelog

@@ -20,10 +20,32 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
 end
 
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
+    end
+end
+# %%RUBYGEMS_SETUP_END%%
+
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
@@ -33,13 +55,13 @@ DEFAULT_PAGER = 'less'
 # List of OpenNebula services and the logs files
 SERVICES = {
     'fireedge' => { :log => 'fireedge.log', :error => 'fireedge.error' },
-    'monitor'  => 'monitor.log',
-    'novnc'    => 'novnc.log',
-    'oned'     => 'oned.log',
+    'monitor'  => { :log => 'monitor.log' },
+    'novnc'    => { :log => 'novnc.log' },
+    'oned'     => { :log => 'oned.log' },
     'onehem'   => { :log => 'onehem.log', :error => 'onehem.error' },
-    'sched'    => 'sched.log',
+    'sched'    => { :log => 'sched.log' },
     'sunstone' => { :log => 'sunstone.log', :error => 'sunstone.error' },
-    'vcenter'  => 'vcenter_monitor.log'
+    'vcenter'  => { :log => 'vcenter_monitor.log' }
 }
 
 require 'command_parser'
@@ -77,25 +99,72 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :get, get_desc, :service, :options => [TYPE, PAGER, PAGER_OPTS] do
-        unless SERVICES[args[0]]
+        logs  = SERVICES[args[0]]
+        pager = options[:pager] || DEFAULT_PAGER
+
+        unless logs
             STDERR.puts "Service '#{args[0]}' not found"
             exit 1
         end
 
-        if options[:type] && !SERVICES[args[0]][options[:type].to_sym]
+        if options[:type] && !logs[options[:type].to_sym]
             STDERR.puts "Log file type '#{options[:type]}' not found"
             exit 1
         end
 
-        if (SERVICES[args[0]].is_a? Hash) && !options[:type]
-            options[:type] = :log
+        options[:type].nil? ? f = logs[:log] : f = logs[options[:type].to_sym]
+
+        system("#{pager} #{options[:pager_opts]} /var/log/one/#{f}")
+    end
+
+    vm_desc = <<-EOT.unindent
+        Gets VM log
+    EOT
+
+    command :'get-vm', vm_desc, :id, :options => [PAGER, PAGER_OPTS] do
+        pager = options[:pager] || DEFAULT_PAGER
+
+        begin
+            Integer(args[0])
+
+            file = "/var/log/one/#{args[0]}.log"
+
+            unless File.exist?(file)
+                STDERR.puts "No LOG file found for '#{args[0]}' VM"
+                exit 1
+            end
+
+            system("#{pager} #{options[:pager_opts]} #{file}")
+        rescue StandardError
+            STDERR.puts 'Only ID is supported'
+            exit 1
         end
+    end
 
-        type  = options[:type].to_sym
+    service_desc = <<-EOT.unindent
+        Gets Service log
+    EOT
+
+    command :'get-service',
+            service_desc,
+            :id,
+            :options => [PAGER, PAGER_OPTS] do
         pager = options[:pager] || DEFAULT_PAGER
 
-        type.nil? ? file = SERVICES[args[0]] : file = SERVICES[args[0]][type]
+        begin
+            Integer(args[0])
+
+            file = "/var/log/one/oneflow/#{args[0]}.log"
 
-        system("#{pager} #{options[:pager_opts]} /var/log/one/#{file}")
+            unless File.exist?(file)
+                STDERR.puts "No LOG file found for '#{args[0]}' service"
+                exit 1
+            end
+
+            system("#{pager} #{options[:pager_opts]} #{file}")
+        rescue StandardError
+            STDERR.puts 'Only ID is supported'
+            exit 1
+        end
     end
 end

data/bin/onemarket

@@ -151,7 +151,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :marketplaceid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |obj|
-            obj.chmod_octet(args[1])
+            obj.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/bin/onemarketapp

@@ -388,7 +388,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :appid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |app|
-            app.chmod_octet(args[1])
+            app.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/bin/onesecgroup

@@ -174,7 +174,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :secgroupid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |t|
-            t.chmod_octet(args[1])
+            t.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/bin/onetemplate

@@ -87,6 +87,14 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
+    PREFIX = {
+        :name => 'prefix',
+        :large => '--prefix prefix',
+        :description => 'Prefix to autogenerate name, e.g: 001, 01',
+        :format => String
+
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -102,7 +110,8 @@ CommandParser::CmdParser.new(ARGV) do
         OneTemplateHelper::MULTIPLE,
         OneTemplateHelper::USERDATA,
         OneVMHelper::HOLD,
-        OneTemplateHelper::PERSISTENT
+        OneTemplateHelper::PERSISTENT,
+        PREFIX
     ]
 
     ########################################################################
@@ -252,16 +261,37 @@ CommandParser::CmdParser.new(ARGV) do
         number      = options[:multiple] || 1
         user_inputs = options[:user_inputs]
 
-        number.times do |i|
-            exit_code = helper.perform_action(args[0], options,
-                                              'instantiated') do |t|
-                name = options[:name]
-                name = name.gsub('%i', i.to_s) if name
-
-                on_hold = !options[:hold].nil?
+        number.times.each_with_index do |i, index|
+            exit_code = helper.perform_action(
+                args[0],
+                options,
+                'instantiated'
+            ) do |t|
+                name   = options[:name]
+                prefix = options[:prefix]
+                c_i    = nil
+                p      = nil
+
+                if prefix && name
+                    # Get leading zeros
+                    p = prefix.scan(/^0+/)[0]
+
+                    # Get current index
+                    c_i = prefix.gsub(p, '') if p
+
+                    # Convert it to Integer to check if we can use it
+                    begin
+                        c_i  = Integer(c_i)
+                        name = name.gsub('%i', "#{p}#{c_i + index}")
+                    rescue StandardError
+                    end
+                elsif name
+                    name = name.gsub('%i', i.to_s)
+                end
 
+                on_hold        = !options[:hold].nil?
                 extra_template = ''
-                rc = t.info
+                rc             = t.info
 
                 if OpenNebula.is_error?(rc)
                     STDERR.puts rc.message
@@ -281,6 +311,10 @@ CommandParser::CmdParser.new(ARGV) do
                     extra_template = res.last
                 end
 
+                if c_i
+                    extra_template.gsub!('%i', "#{p}#{c_i + index}")
+                end
+
                 if !user_inputs
                     user_inputs = OneTemplateHelper.get_user_inputs(t.to_hash)
                 else
@@ -344,7 +378,7 @@ CommandParser::CmdParser.new(ARGV) do
         recursive = (options[:recursive] == true)
 
         helper.perform_actions(args[0], options, 'Permissions changed') do |t|
-            t.chmod_octet(args[1], recursive)
+            t.chmod_octet(OpenNebulaHelper.to_octet(args[1]), recursive)
         end
     end
 

data/bin/onevcenter

@@ -409,7 +409,42 @@ CommandParser::CmdParser.new(ARGV) do
 
         begin
             print '.'
-            vm, keys = helper.clear_tags(vmid)
+
+            client = Client.new
+
+            vm_pool   = VirtualMachinePool.new(client, -1)
+            host_pool = HostPool.new(client)
+            deploy_id = -1
+            host_id   = -1
+            hostname  = ''
+
+            rc = vm_pool.info
+            raise rc.message if OpenNebula.is_error?(rc)
+
+            rc = host_pool.info
+            raise rc.message if OpenNebula.is_error?(rc)
+
+            vm_pool.each do |vm|
+                next if vm.id.to_s != vmid
+
+                deploy_id  = vm.deploy_id
+                vm_history = vm.to_hash['VM']['HISTORY_RECORDS']['HISTORY']
+                hostname   = vm_history['HOSTNAME']
+                break
+            end
+
+            host_pool.each do |host|
+                if host.name == hostname
+                    host_id = host.id
+                end
+            end
+
+            vi_client = VCenterDriver::VIClient.new_from_host(host_id)
+            vm        = VCenterDriver::VirtualMachine
+                        .new(vi_client, deploy_id, vmid)
+
+            keys = vm.extra_config_keys
+
             print '.'
 
             if keys.empty?
@@ -422,7 +457,7 @@ CommandParser::CmdParser.new(ARGV) do
             puts 'The following keys will be removed:'
             keys.each {|key| puts "\t- #{key}" }
 
-            helper.remove_keys(vm, keys)
+            vm.clear_tags
         rescue StandardError => e
             STDERR.puts "Couldn't clear VM tags. Reason: #{e.message}"
             exit 1

data/bin/onevm

@@ -472,7 +472,13 @@ CommandParser::CmdParser.new(ARGV) do
             verbose = "disk #{disk_id} prepared to be saved in " \
                       "the image #{image_name}"
         else
-            snapshot_id = snapshot_id.to_i
+            err, snapshot_id = helper.retrieve_disk_snapshot_id(args[0],
+                                                                snapshot_id)
+
+            if err == -1
+                STDERR.puts snapshot_id
+                exit(-1)
+            end
 
             verbose = "disk #{disk_id} snapshot #{snapshot_id} prepared to " \
                       "be saved in the image #{image_name}"
@@ -981,7 +987,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :vmid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |vm|
-            vm.chmod_octet(args[1])
+            vm.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/bin/onevmgroup

@@ -197,7 +197,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :vmgroupid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |t|
-            t.chmod_octet(args[1])
+            t.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/bin/onevnet

@@ -335,7 +335,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :vnetid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |vn|
-            vn.chmod_octet(args[1])
+            vn.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/bin/onevntemplate

@@ -87,6 +87,14 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
+    PREFIX = {
+        :name => 'prefix',
+        :large => '--prefix prefix',
+        :description => 'Prefix to autogenerate name, e.g: 001, 01',
+        :format => String
+
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -102,7 +110,8 @@ CommandParser::CmdParser.new(ARGV) do
         OneVNTemplateHelper::MULTIPLE,
         OneVNTemplateHelper::EXTENDED,
         OpenNebulaHelper::AS_USER,
-        OpenNebulaHelper::AS_GROUP
+        OpenNebulaHelper::AS_GROUP,
+        PREFIX
     ]
 
     ########################################################################
@@ -204,10 +213,32 @@ CommandParser::CmdParser.new(ARGV) do
         number = options[:multiple] || 1
 
         number.times do |i|
-            exit_code = helper.perform_action(args[0], options,
-                                              'instantiated') do |t|
-                name = options[:name]
-                name = name.gsub('%i', i.to_s) if name
+            exit_code = helper.perform_action(
+                args[0],
+                options,
+                'instantiated'
+            ) do |t|
+                name   = options[:name]
+                prefix = options[:prefix]
+                c_i    = nil
+                p      = nil
+
+                if prefix && name
+                    # Get leading zeros
+                    p = prefix.scan(/^0+/)[0]
+
+                    # Get current index
+                    c_i = prefix.gsub(p, '') if p
+
+                    # Convert it to Integer to check if we can use it
+                    begin
+                        c_i  = Integer(c_i)
+                        name = name.gsub('%i', "#{p}#{c_i + index}")
+                    rescue StandardError
+                    end
+                elsif name
+                    name = name.gsub('%i', i.to_s)
+                end
 
                 extra_template = ''
                 rc = t.info
@@ -234,6 +265,10 @@ CommandParser::CmdParser.new(ARGV) do
                     end
                 end
 
+                if c_i
+                    extra_template.gsub!('%i', "#{p}#{c_i + index}")
+                end
+
                 res = t.instantiate(name, extra_template)
 
                 if !OpenNebula.is_error?(res)
@@ -279,7 +314,7 @@ CommandParser::CmdParser.new(ARGV) do
         recursive = (options[:recursive] == true)
 
         helper.perform_actions(args[0], options, 'Permissions changed') do |t|
-            t.chmod_octet(args[1], recursive)
+            t.chmod_octet(OpenNebulaHelper.to_octet(args[1]), recursive)
         end
     end
 

data/bin/onevrouter

@@ -251,7 +251,7 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :chmod, chmod_desc, [:range, :vrouterid_list], :octet do
         helper.perform_actions(args[0], options, 'Permissions changed') do |obj|
-            obj.chmod_octet(args[1])
+            obj.chmod_octet(OpenNebulaHelper.to_octet(args[1]))
         end
     end
 

data/lib/one_helper/onevcenter_helper.rb

@@ -520,59 +520,4 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
         opts
     end
 
-    def clear_tags(vmid)
-        client = Client.new
-
-        vm_pool   = VirtualMachinePool.new(client, -1)
-        host_pool = HostPool.new(client)
-        deploy_id = -1
-        host_id   = -1
-        hostname  = ''
-
-        rc = vm_pool.info
-        raise rc.message if OpenNebula.is_error?(rc)
-
-        rc = host_pool.info
-        raise rc.message if OpenNebula.is_error?(rc)
-
-        vm_pool.each do |vm|
-            next if vm.id.to_s != vmid
-
-            deploy_id  = vm.deploy_id
-            vm_history = vm.to_hash['VM']['HISTORY_RECORDS']['HISTORY']
-            hostname   = vm_history['HOSTNAME']
-            break
-        end
-
-        host_pool.each do |host|
-            if host.name == hostname
-                host_id = host.id
-            end
-        end
-
-        vi_client = VCenterDriver::VIClient.new_from_host(host_id)
-        vm        = VCenterDriver::VirtualMachine
-                    .new(vi_client, deploy_id, vmid)
-
-        keys_to_remove = []
-        vm['config.extraConfig'].each do |extraconfig|
-            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]
-    end
-
-    def remove_keys(vm, keys_to_remove)
-        spec_hash = keys_to_remove.map {|key| { :key => key, :value => '' } }
-
-        spec = RbVmomi::VIM.VirtualMachineConfigSpec(
-            :extraConfig => spec_hash
-        )
-        vm.item.ReconfigVM_Task(:spec => spec).wait_for_completion
-    end
-
 end

data/lib/one_helper/onevm_helper.rb

@@ -297,7 +297,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         vm.info
         ids = vm.retrieve_elements("/VM/SNAPSHOTS/SNAPSHOT[NAME='#{id}']/ID")
 
-        return [-1, "#{id} not found or duplicated"] \
+        return [-1, "Snapshot #{id} not found or duplicated"] \
                 if ids.nil? || ids.size > 1
 
         [0, ids[0].to_i]

data/lib/one_helper.rb

@@ -747,12 +747,9 @@ EOT
                     ppid = start_pager
                 end
 
-                puts "<#{pname}>"
-
                 puts page
 
                 if elements < size
-                    puts "</#{pname}>"
                     return 0
                 end
 
@@ -2305,4 +2302,55 @@ EOT
         end
     end
 
+    # Convert u=rwx,g=rx,o=r to octet
+    #
+    # @param perm [String] Permissions in human readbale format
+    #
+    # @return [String] Permissions in octet format
+    def OpenNebulaHelper.to_octet(perm)
+        begin
+            Integer(perm)
+            perm
+        rescue StandardError
+            perm = perm.split(',')
+            ret  = 0
+
+            perm.each do |p|
+                p = p.split('=')
+
+                next unless p.size == 2
+
+                r = p[1].count('r')
+                w = p[1].count('w')
+                x = p[1].count('x')
+
+                rwx = (2 ** 0) * x + (2 ** 1) * w + (2 ** 2) * r
+
+                case p[0]
+                when 'u'
+                    ret += rwx * 100
+                when 'g'
+                    ret += rwx * 10
+                else
+                    ret += rwx * 1
+                end
+            end
+
+            if ret == 0
+                STDERR.puts 'Error in permissions format'
+                exit(-1)
+            else
+                ret = ret.to_s
+
+                if ret.size == 1
+                    "00#{ret}"
+                elsif ret.size == 2
+                    "0#{ret}"
+                else
+                    ret
+                end
+            end
+        end
+    end
+
 end

data/share/schemas/xsd/host.xsd

@@ -65,9 +65,11 @@
                           <xs:element name="DOMAIN" type="xs:string"/>
                           <xs:element name="FUNCTION" type="xs:string"/>
                           <xs:element name="NUMA_NODE" type="xs:string"/>
+                          <xs:element name="PROFILES" type="xs:string" minOccurs="0"/>
                           <xs:element name="SHORT_ADDRESS" type="xs:string"/>
                           <xs:element name="SLOT" type="xs:string"/>
                           <xs:element name="TYPE" type="xs:string"/>
+                          <xs:element name="UUID" type="xs:string" minOccurs="0"/>
                           <xs:element name="VENDOR" type="xs:string"/>
                           <xs:element name="VENDOR_NAME" type="xs:string"/>
                           <xs:element name="VMID" type="xs:integer"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.4.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement