opennebula 6.4.3 → 6.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5f6ca2f486dd7127edf5b9320376397e778f33335e3d9403b6fa2f2b96fc2cd
-  data.tar.gz: 0101d985b9b7d4bc22499a3a2478b54a98fdb6d1384a235f66515851fab9f399
+  metadata.gz: 34ad5b5d6ddf88c8d92248d3c321d7e6891609fbc83776ef6d0a71ea6e634977
+  data.tar.gz: 2efb015748722ee63a336106a59b1306b0382049cdeb44ef86eee11a957f7379
 SHA512:
-  metadata.gz: 619e3110a10dcb5959009b1c077685448b38cae6cd8e5bb2e53ff1ec3d922d660e6e91be9d17012f5046ea5b9055697399a80ddbb7b7408fd9fedb196c46e0fa
-  data.tar.gz: 12561af3a0ceffd756e90da166dba0625444118cf137ebb9d781f034175b330ee4d0cd8fe99997285ac0ee55c51af58acca4ec9dea0f494f4a27d3b22301eede
+  metadata.gz: f3a43640e13e4a9e73e2b3efc8ae5da0793b50a56b8655a855e4b42820869515d602a7fd3ede1ace8f8996d64cbb78b82461c5f90466256498538d9f048e70c6
+  data.tar.gz: 54c3b592674fdca5ed5836aac7b32336fd4a1970dc2b816ad0236c622133559f136fc545b4be56a26f3fee847572c4f30970d5cd8ba44fdc92af0d4e53484403

data/lib/DriverExecHelper.rb

@@ -189,7 +189,7 @@ module DriverExecHelper
                 cfg=file.read
             end
 
-            cfg.split(/\n/).each do |line|
+            cfg.split("\n").each do |line|
                 m=line.match(/^([^=]+)=(.*)$/)
 
                 next unless m

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.4.3'
+    VERSION = '6.4.5'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/datastore.rb

@@ -743,9 +743,9 @@ module VCenterDriver
                         image_path = ''
 
                         # Skip not relevant files
-                        next unless %w[FloppyImageFileInfo
-                                       IsoImageFileInfo
-                                       VmDiskFileInfo].include? image.class.to_s
+                        next unless ['FloppyImageFileInfo',
+                                     'IsoImageFileInfo',
+                                     'VmDiskFileInfo'].include? image.class.to_s
 
                         # Get image path and name
                         image_path << folderpath << image.path

data/lib/file_helper.rb

@@ -109,7 +109,7 @@ module VCenterDriver
         def self.needs_unpack?(file_path)
             type = get_type(file_path)
             type.gsub!(%r{^application/(x-)?}, '')
-            %w[bzip2 gzip tar].include?(type)
+            ['bzip2', 'gzip', 'tar'].include?(type)
         end
 
         def self.vcenter_file_info(file_path)

data/lib/host.rb

@@ -352,7 +352,7 @@ module VCenterDriver
             str_info << 'USEDMEMORY='  << (total_mem - free_mem).to_s << "\n"
 
             # DRS enabled
-            str_info << 'VCENTER_DRS='  << drs_enabled.to_s << "\n"
+            str_info << 'VCENTER_DRS=' << drs_enabled.to_s << "\n"
 
             # HA enabled
             str_info << 'VCENTER_HA=' << ha_enabled.to_s << "\n"

data/lib/models/role.rb

@@ -32,26 +32,26 @@ module OpenNebula
         attr_reader :service
 
         # Actions that can be performed on the VMs of a given Role
-        SCHEDULE_ACTIONS = %w[
-            terminate
-            terminate-hard
-            undeploy
-            undeploy-hard
-            hold
-            release
-            stop
-            suspend
-            resume
-            reboot
-            reboot-hard
-            poweroff
-            poweroff-hard
-            snapshot-create
-            snapshot-revert
-            snapshot-delete
-            disk-snapshot-create
-            disk-snapshot-revert
-            disk-snapshot-delete
+        SCHEDULE_ACTIONS = [
+            'terminate',
+            'terminate-hard',
+            'undeploy',
+            'undeploy-hard',
+            'hold',
+            'release',
+            'stop',
+            'suspend',
+            'resume',
+            'reboot',
+            'reboot-hard',
+            'poweroff',
+            'poweroff-hard',
+            'snapshot-create',
+            'snapshot-revert',
+            'snapshot-delete',
+            'disk-snapshot-create',
+            'disk-snapshot-revert',
+            'disk-snapshot-delete'
         ]
 
         STATE = {
@@ -69,52 +69,52 @@ module OpenNebula
             'HOLD'               => 11
         }
 
-        STATE_STR = %w[
-            PENDING
-            DEPLOYING
-            RUNNING
-            UNDEPLOYING
-            WARNING
-            DONE
-            FAILED_UNDEPLOYING
-            FAILED_DEPLOYING
-            SCALING
-            FAILED_SCALING
-            COOLDOWN
-            HOLD
+        STATE_STR = [
+            'PENDING',
+            'DEPLOYING',
+            'RUNNING',
+            'UNDEPLOYING',
+            'WARNING',
+            'DONE',
+            'FAILED_UNDEPLOYING',
+            'FAILED_DEPLOYING',
+            'SCALING',
+            'FAILED_SCALING',
+            'COOLDOWN',
+            'HOLD'
         ]
 
-        RECOVER_DEPLOY_STATES = %w[
-            FAILED_DEPLOYING
-            DEPLOYING
-            PENDING
+        RECOVER_DEPLOY_STATES = [
+            'FAILED_DEPLOYING',
+            'DEPLOYING',
+            'PENDING'
         ]
 
-        RECOVER_UNDEPLOY_STATES = %w[
-            FAILED_UNDEPLOYING
-            UNDEPLOYING
+        RECOVER_UNDEPLOY_STATES = [
+            'FAILED_UNDEPLOYING',
+            'UNDEPLOYING'
         ]
 
-        RECOVER_SCALE_STATES = %w[
-            FAILED_SCALING
-            SCALING
+        RECOVER_SCALE_STATES = [
+            'FAILED_SCALING',
+            'SCALING'
         ]
 
-        VM_FAILURE_STATES = %w[
-            BOOT_FAILURE
-            BOOT_MIGRATE_FAILURE
-            PROLOG_MIGRATE_FAILURE
-            PROLOG_FAILURE
-            EPILOG_FAILURE
-            EPILOG_STOP_FAILURE
-            EPILOG_UNDEPLOY_FAILURE
-            PROLOG_MIGRATE_POWEROFF_FAILURE
-            PROLOG_MIGRATE_SUSPEND_FAILURE
-            PROLOG_MIGRATE_UNKNOWN_FAILURE
-            BOOT_UNDEPLOY_FAILURE
-            BOOT_STOPPED_FAILURE
-            PROLOG_RESUME_FAILURE
-            PROLOG_UNDEPLOY_FAILURE
+        VM_FAILURE_STATES = [
+            'BOOT_FAILURE',
+            'BOOT_MIGRATE_FAILURE',
+            'PROLOG_MIGRATE_FAILURE',
+            'PROLOG_FAILURE',
+            'EPILOG_FAILURE',
+            'EPILOG_STOP_FAILURE',
+            'EPILOG_UNDEPLOY_FAILURE',
+            'PROLOG_MIGRATE_POWEROFF_FAILURE',
+            'PROLOG_MIGRATE_SUSPEND_FAILURE',
+            'PROLOG_MIGRATE_UNKNOWN_FAILURE',
+            'BOOT_UNDEPLOY_FAILURE',
+            'BOOT_STOPPED_FAILURE',
+            'PROLOG_RESUME_FAILURE',
+            'PROLOG_UNDEPLOY_FAILURE'
         ]
 
         SCALE_WAYS = {
@@ -129,17 +129,17 @@ module OpenNebula
         # parents: this has only sense in deploy operation
         # state: this is internal information managed by OneFlow server
         # vm_template: this will affect scale operation
-        IMMUTABLE_ATTRS = %w[
-            cardinality
-            last_vmname
-            nodes
-            parents
-            state
-            vm_template
+        IMMUTABLE_ATTRS = [
+            'cardinality',
+            'last_vmname',
+            'nodes',
+            'parents',
+            'state',
+            'vm_template'
         ]
 
         # VM information to save in document
-        VM_INFO = %w[ID UID GID UNAME GNAME NAME]
+        VM_INFO = ['ID', 'UID', 'GID', 'UNAME', 'GNAME', 'NAME']
 
         LOG_COMP = 'ROL'
 

data/lib/models/service.rb

@@ -42,64 +42,64 @@ module OpenNebula
             'HOLD'                    => 15
         }
 
-        STATE_STR = %w[
-            PENDING
-            DEPLOYING
-            RUNNING
-            UNDEPLOYING
-            WARNING
-            DONE
-            FAILED_UNDEPLOYING
-            FAILED_DEPLOYING
-            SCALING
-            FAILED_SCALING
-            COOLDOWN
-            DEPLOYING_NETS
-            UNDEPLOYING_NETS
-            FAILED_DEPLOYING_NETS
-            FAILED_UNDEPLOYING_NETS
-            HOLD
+        STATE_STR = [
+            'PENDING',
+            'DEPLOYING',
+            'RUNNING',
+            'UNDEPLOYING',
+            'WARNING',
+            'DONE',
+            'FAILED_UNDEPLOYING',
+            'FAILED_DEPLOYING',
+            'SCALING',
+            'FAILED_SCALING',
+            'COOLDOWN',
+            'DEPLOYING_NETS',
+            'UNDEPLOYING_NETS',
+            'FAILED_DEPLOYING_NETS',
+            'FAILED_UNDEPLOYING_NETS',
+            'HOLD'
         ]
 
-        TRANSIENT_STATES = %w[
-            DEPLOYING
-            UNDEPLOYING
-            SCALING
-            COOLDOWN
-            DEPLOYING_NETS
-            UNDEPLOYING_NETS
+        TRANSIENT_STATES = [
+            'DEPLOYING',
+            'UNDEPLOYING',
+            'SCALING',
+            'COOLDOWN',
+            'DEPLOYING_NETS',
+            'UNDEPLOYING_NETS'
         ]
 
-        FAILED_STATES = %w[
-            FAILED_DEPLOYING
-            FAILED_UNDEPLOYING
-            FAILED_SCALING
-            FAILED_DEPLOYING_NETS
-            FAILED_UNDEPLOYING_NETS
+        FAILED_STATES = [
+            'FAILED_DEPLOYING',
+            'FAILED_UNDEPLOYING',
+            'FAILED_SCALING',
+            'FAILED_DEPLOYING_NETS',
+            'FAILED_UNDEPLOYING_NETS'
         ]
 
-        RECOVER_DEPLOY_STATES = %w[
-            FAILED_DEPLOYING
-            DEPLOYING
-            PENDING
+        RECOVER_DEPLOY_STATES = [
+            'FAILED_DEPLOYING',
+            'DEPLOYING',
+            'PENDING'
         ]
 
-        RECOVER_UNDEPLOY_STATES = %w[
-            FAILED_UNDEPLOYING
-            UNDEPLOYING
-            FAILED_UNDEPLOYING_NETS
+        RECOVER_UNDEPLOY_STATES = [
+            'FAILED_UNDEPLOYING',
+            'UNDEPLOYING',
+            'FAILED_UNDEPLOYING_NETS'
         ]
 
-        RECOVER_SCALE_STATES = %w[
-            FAILED_SCALING
-            SCALING
+        RECOVER_SCALE_STATES = [
+            'FAILED_SCALING',
+            'SCALING'
         ]
 
-        RECOVER_DEPLOY_NETS_STATES = %w[DEPLOYING_NETS FAILED_DEPLOYING_NETS]
+        RECOVER_DEPLOY_NETS_STATES = ['DEPLOYING_NETS', 'FAILED_DEPLOYING_NETS']
 
-        RECOVER_UNDEPLOY_NETS_STATES = %w[
-            UNDEPLOYING_NETS
-            FAILED_UNDEPLOYING_NETS
+        RECOVER_UNDEPLOY_NETS_STATES = [
+            'UNDEPLOYING_NETS',
+            'FAILED_UNDEPLOYING_NETS'
         ]
 
         # List of attributes that can't be changed in update operation
@@ -114,17 +114,17 @@ module OpenNebula
         # ready_status_gate: it only has sense when deploying, not in running
         # state: this is internal information managed by OneFlow server
         # start_time: this is internal information managed by OneFlow server
-        IMMUTABLE_ATTRS = %w[
-            custom_attrs
-            custom_attrs_values
-            deployment
-            log
-            name
-            networks
-            networks_values
-            ready_status_gate
-            state
-            start_time
+        IMMUTABLE_ATTRS = [
+            'custom_attrs',
+            'custom_attrs_values',
+            'deployment',
+            'log',
+            'name',
+            'networks',
+            'networks_values',
+            'ready_status_gate',
+            'state',
+            'start_time'
         ]
 
         LOG_COMP = 'SER'
@@ -677,7 +677,7 @@ module OpenNebula
                 vnet.each do |_, net|
                     key = net.keys.first
 
-                    next unless %w[template_id reserve_from].include?(key)
+                    next unless ['template_id', 'reserve_from'].include?(key)
 
                     rc = OpenNebula::VirtualNetwork.new_with_id(
                         net['id'],

data/lib/nsx_constants.rb

@@ -127,7 +127,7 @@ end
             }
         }
         NSXV_RULE_BASE = 'xxx'
-        NSX_RULE_IPSEC_PORTS = %w[500 4500]
+        NSX_RULE_IPSEC_PORTS = ['500', '4500']
         # Logical Ports
         NSXT_LP_BASE = NSXT_BASE + '/logical-ports/'
         NSXV_LP_BASE = ''

data/lib/opennebula/flow/service_template.rb

@@ -50,11 +50,11 @@ module OpenNebula
                 },
                 'shutdown_action' => {
                     :type => :string,
-                    :enum => %w[
-                        terminate
-                        terminate-hard
-                        shutdown
-                        shutdown-hard
+                    :enum => [
+                        'terminate',
+                        'terminate-hard',
+                        'shutdown',
+                        'shutdown-hard'
                     ],
                     :required => false
                 },
@@ -84,10 +84,10 @@ module OpenNebula
                         :properties => {
                             'type' => {
                                 :type => :string,
-                                :enum => %w[
-                                    CHANGE
-                                    CARDINALITY
-                                    PERCENTAGE_CHANGE
+                                :enum => [
+                                    'CHANGE',
+                                    'CARDINALITY',
+                                    'PERCENTAGE_CHANGE'
                                 ],
                                 :required => true
                             },
@@ -133,10 +133,10 @@ module OpenNebula
                         :properties => {
                             'type' => {
                                 :type => :string,
-                                :enum => %w[
-                                    CHANGE
-                                    CARDINALITY
-                                    PERCENTAGE_CHANGE
+                                :enum => [
+                                    'CHANGE',
+                                    'CARDINALITY',
+                                    'PERCENTAGE_CHANGE'
                                 ],
                                 :required => true
                             },
@@ -172,7 +172,7 @@ module OpenNebula
                 },
                 'deployment' => {
                     :type => :string,
-                    :enum => %w[none straight],
+                    :enum => ['none', 'straight'],
                     :default => 'none'
                 },
                 'description' => {
@@ -181,11 +181,11 @@ module OpenNebula
                 },
                 'shutdown_action' => {
                     :type => :string,
-                    :enum => %w[
-                        terminate
-                        terminate-hard
-                        shutdown
-                        shutdown-hard
+                    :enum => [
+                        'terminate',
+                        'terminate-hard',
+                        'shutdown',
+                        'shutdown-hard'
                     ],
                     :required => false
                 },
@@ -235,8 +235,8 @@ module OpenNebula
         # List of attributes that can't be changed in update operation
         #
         # registration_time: this is internal info managed by OneFlow server
-        IMMUTABLE_ATTRS = %w[
-            registration_time
+        IMMUTABLE_ATTRS = [
+            'registration_time'
         ]
 
         def self.init_default_vn_name_template(vn_name_template)

data/lib/opennebula/marketplaceapp_ext.rb

@@ -314,9 +314,9 @@ module OpenNebula::MarketPlaceAppExt
             # @param image    [OpenNebula::Image]     Image information
             def create_vcenter_template(ds, options, template, image = nil)
                 ret  = {}
-                keys = %w[VCENTER_TEMPLATE_REF
-                          VCENTER_CCR_REF
-                          VCENTER_INSTANCE_ID]
+                keys = ['VCENTER_TEMPLATE_REF',
+                        'VCENTER_CCR_REF',
+                        'VCENTER_INSTANCE_ID']
 
                 if ds['//VCENTER_TEMPLATE_REF']
                     keys.each do |key|

data/lib/opennebula/ssh_auth.rb

@@ -14,104 +14,127 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-
-require 'pp'
 require 'openssl'
 require 'base64'
 require 'fileutils'
+require 'open3'
+require 'tempfile'
+
+module OpenNebula
+
+    # SSH key authentication class. It can be used as a driver for auth_mad
+    # as auth method is defined. It also holds some helper methods to be used
+    # by oneauth command
+    class SshAuth
+
+        # Initialize SshAuth object
+        #
+        # @param [Hash] default options for path
+        # @option options [String] :public_key public key for the user
+        # @option options [String] :private_key key private key for the user.
+        def initialize(options = {})
+            @private_key = nil
+            @public_key  = nil
+
+            # Initialize the private key
+            if options[:private_key]
+                begin
+                    @private_key = File.read(options[:private_key])
+                rescue StandardError => e
+                    raise "Cannot read #{options[:private_key]}\n #{e}"
+                end
 
-module OpenNebula; end
-
-# SSH key authentication class. It can be used as a driver for auth_mad
-# as auth method is defined. It also holds some helper methods to be used
-# by oneauth command
-class OpenNebula::SshAuth
-    # Initialize SshAuth object
-    #
-    # @param [Hash] default options for path
-    # @option options [String] :public_key public key for the user
-    # @option options [String] :private_key key private key for the user.
-    def initialize(options={})
-        @private_key = nil
-        @public_key  = nil
-
-        # Initialize the private key
-        if options[:private_key]
-            begin
-                @private_key = File.read(options[:private_key])
-            rescue Exception => e
-                raise "Cannot read #{options[:private_key]}"
+                begin
+                    @private_key_rsa = OpenSSL::PKey::RSA.new(@private_key)
+                rescue OpenSSL::PKey::RSAError
+                    private_key_pem = openssh_to_pem(@private_key)
+                    @private_key_rsa = OpenSSL::PKey::RSA.new(private_key_pem)
+                end
+            end
+
+            # Initialize the public key
+            if options[:public_key]
+                @public_key = options[:public_key]
+            elsif !@private_key.nil?
+                # Init ssh keys using private key. public key is extracted in a
+                # format compatible with openssl. The public key does not contain
+                # "---- BEGIN/END PUBLIC KEY ----" and is in a single line
+                @public_key = @private_key_rsa.public_key.to_pem.split("\n")
+                @public_key = @public_key.reject {|l| l.match(/PUBLIC KEY/) }.join('')
+            end
+
+            if @private_key.nil? && @public_key.nil?
+                raise 'You have to define at least one of the keys'
             end
 
-            @private_key_rsa = OpenSSL::PKey::RSA.new(@private_key)
+            @public_key_rsa = OpenSSL::PKey::RSA.new(Base64.decode64(@public_key))
         end
 
-        # Initialize the public key
-        if options[:public_key]
-            @public_key = options[:public_key]
-        elsif @private_key != nil
-            # Init ssh keys using private key. public key is extracted in a
-            # format compatible with openssl. The public key does not contain
-            # "---- BEGIN/END PUBLIC KEY ----" and is in a single line
-            @public_key = @private_key_rsa.public_key.to_pem.split("\n")
-            @public_key = @public_key.reject {|l| l.match(/PUBLIC KEY/) }.join('')
+        # Creates a login token for ssh authentication.
+        # By default it is valid for 1 hour but it can be changed to any number
+        # of seconds with expire parameter (in seconds)
+        def login_token(user, expire = 3600)
+            expire ||= 3600
+
+            return encrypt("#{user}:#{Time.now.to_i + expire.to_i}")
         end
 
-        if @private_key.nil? && @public_key.nil?
-            raise "You have to define at least one of the keys"
+        # Returns a valid password string to create a user using this auth driver.
+        # In this case the ssh public key.
+        def password
+            @public_key
         end
 
-        @public_key_rsa = OpenSSL::PKey::RSA.new(Base64::decode64(@public_key))
-    end
+        # Checks the proxy created with the login method
+        def authenticate(user, token)
+            begin
+                token_plain = decrypt(token)
+                t_user, time = token_plain.split(':')
 
-    # Creates a login token for ssh authentication.
-    # By default it is valid for 1 hour but it can be changed to any number
-    # of seconds with expire parameter (in seconds)
-    def login_token(user, expire=3600)
-        expire ||= 3600
+                return 'invalid credentials' unless user == t_user
+                return 'ssh proxy expired, login again to renew it' if Time.now.to_i >= time.to_i
 
-        return encrypt("#{user}:#{Time.now.to_i + expire.to_i}")
-    end
+                return true
+            rescue StandardError
+                return 'error'
+            end
+        end
 
-    # Returns a valid password string to create a user using this auth driver.
-    # In this case the ssh public key.
-    def password
-        @public_key
-    end
+        private
 
-    # Checks the proxy created with the login method
-    def authenticate(user, token)
-        begin
-            token_plain = decrypt(token)
-            _user, time = token_plain.split(':')
-
-            if user == _user
-                if Time.now.to_i >= time.to_i
-                    return "ssh proxy expired, login again to renew it"
-                else
-                    return true
-                end
-            else
-                return "invalid credentials"
-            end
-        rescue
-            return "error"
+        def openssh_to_pem(private_key)
+            temp_file = Tempfile.new('private_key')
+
+            File.write(temp_file.path, private_key)
+
+            # Use ssh-keygen to convert the key
+            command = "ssh-keygen -p -N '' -m PEM -f #{temp_file.path}"
+
+            _out, err, status = Open3.capture3(command)
+
+            raise "Failed to convert key: #{err}" unless status.success?
+
+            pem_key = File.read(temp_file.path)
+            return pem_key
+        ensure
+            temp_file.close
+            temp_file.unlink if temp_file
+        end
+
+        ###########################################################################
+        #                       Methods to handle ssh keys
+        ###########################################################################
+        # Encrypts data with the private key of the user and returns
+        # base 64 encoded output in a single line
+        def encrypt(data)
+            Base64.encode64(@private_key_rsa.private_encrypt(data)).gsub!("\n", '').strip
         end
-    end
 
-    private
+        # Decrypts base 64 encoded data with pub_key (public key)
+        def decrypt(data)
+            @public_key_rsa.public_decrypt(Base64.decode64(data))
+        end
 
-    ###########################################################################
-    #                       Methods to handle ssh keys
-    ###########################################################################
-    # Encrypts data with the private key of the user and returns
-    # base 64 encoded output in a single line
-    def encrypt(data)
-        Base64::encode64(@private_key_rsa.private_encrypt(data)).gsub!(/\n/, '').strip
     end
 
-    # Decrypts base 64 encoded data with pub_key (public key)
-    def decrypt(data)
-        @public_key_rsa.public_decrypt(Base64::decode64(data))
-    end
 end

data/lib/opennebula/template_ext.rb

@@ -79,7 +79,7 @@ module OpenNebula::TemplateExt
                         image['STATE'].to_i
                     ]
 
-                    unless %w[LOCKED READY USED].include?(i_state)
+                    unless ['LOCKED', 'READY', 'USED'].include?(i_state)
                         logger.fatal "Wrong image state #{i_state}" if logger
 
                         rollback(ids)
@@ -204,7 +204,7 @@ module OpenNebula::TemplateExt
             #   @param nic [XMLElement] to delete attributes from
             #-------------------------------------------------------------------
             def delete_nic_attributes(nic)
-                %w[NETWORK NETWORK_ID NETWORK_UNAME SECURITY_GROUPS].each do |a|
+                ['NETWORK', 'NETWORK_ID', 'NETWORK_UNAME', 'SECURITY_GROUPS'].each do |a|
                     nic.delete_element(a)
                 end
             end

data/lib/opennebula/virtual_machine_ext.rb

@@ -47,17 +47,16 @@ module OpenNebula::VirtualMachineExt
             # @return [Integer, OpenNebula::Error] the new Template ID in case
             #   of success, error otherwise
             #-------------------------------------------------------------------
-            REMOVE_VNET_ATTRS = %w[AR_ID BRIDGE CLUSTER_ID IP MAC TARGET NIC_ID
-                                   NETWORK_ID VN_MAD SECURITY_GROUPS VLAN_ID
-                                   BRIDGE_TYPE]
-
-            REMOVE_IMAGE_ATTRS = %w[DEV_PREFIX SOURCE ORIGINAL_SIZE SIZE
-                                    DISK_SNAPSHOT_TOTAL_SIZE DRIVER IMAGE_STATE
-                                    SAVE CLONE READONLY PERSISTENT TARGET
-                                    ALLOW_ORPHANS CLONE_TARGET CLUSTER_ID
-                                    DATASTORE DATASTORE_ID DISK_ID DISK_TYPE
-                                    IMAGE_ID IMAGE IMAGE_UNAME IMAGE_UID
-                                    LN_TARGET TM_MAD TYPE OPENNEBULA_MANAGED]
+            REMOVE_VNET_ATTRS = ['AR_ID', 'BRIDGE', 'CLUSTER_ID', 'IP', 'MAC', 'TARGET', 'NIC_ID',
+                                 'NETWORK_ID', 'VN_MAD', 'SECURITY_GROUPS', 'VLAN_ID',
+                                 'BRIDGE_TYPE']
+
+            REMOVE_IMAGE_ATTRS = ['DEV_PREFIX', 'SOURCE', 'ORIGINAL_SIZE', 'SIZE',
+                                  'DISK_SNAPSHOT_TOTAL_SIZE', 'DRIVER', 'IMAGE_STATE', 'SAVE',
+                                  'CLONE', 'READONLY', 'PERSISTENT', 'TARGET', 'ALLOW_ORPHANS',
+                                  'CLONE_TARGET', 'CLUSTER_ID', 'DATASTORE', 'DATASTORE_ID',
+                                  'DISK_ID', 'DISK_TYPE', 'IMAGE_ID', 'IMAGE', 'IMAGE_UNAME',
+                                  'IMAGE_UID', 'LN_TARGET', 'TM_MAD', 'TYPE', 'OPENNEBULA_MANAGED']
 
             def save_as_template(name, desc, opts = {})
                 opts = {

data/lib/opennebula.rb

@@ -77,5 +77,5 @@ require 'opennebula/flow'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.4.3'
+    VERSION = '6.4.5'
 end

data/lib/virtual_machine.rb

@@ -1126,7 +1126,7 @@ end
                 when OPAQUE_CARD.to_s
                     # Select only Opaque Networks
                     opaque_networks = @item.network.select do |net|
-                        RbVmomi::VIM::OpaqueNetwork == net.class
+                        net.class == RbVmomi::VIM::OpaqueNetwork
                     end
                     opaque_network = opaque_networks.find do |opn|
                         backing.opaqueNetworkId == opn.summary.opaqueNetworkId
@@ -1296,7 +1296,7 @@ end
                             when OPAQUE_CARD.to_s
                                 # Select only Opaque Networks
                                 opaque_networks = @item.network.select do |net|
-                                    RbVmomi::VIM::OpaqueNetwork == net.class
+                                    net.class == RbVmomi::VIM::OpaqueNetwork
                                 end
                                 opaque_network = opaque_networks.find do |opn|
                                     nic.backing.opaqueNetworkId ==
@@ -3302,6 +3302,12 @@ end
             @item.MarkAsTemplate
         end
 
+        def mark_as_virtual_machine
+            @item.MarkAsVirtualMachine(
+                :pool => cluster['resourcePool']
+            )
+        end
+
         def reset
             @item.ResetVM_Task.wait_for_completion
         end

data/lib/virtual_wire.rb

@@ -91,7 +91,7 @@ module NSXDriver
                            .get(url)
                            .xpath(NSXConstants::NSXV_LS_XPATH)
             virtualwires.each do |virtualwire|
-                lsname_arr = name.split(/-sid-/)
+                lsname_arr = name.split('-sid-')
                 lsname = lsname_arr[-1].split('-', 2)[-1]
                 lsid = lsname_arr[0].split(/vxw-dvs-\w.-/)[-1]
                 if virtualwire.xpath('name').text == lsname &&

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.4.3
+  version: 6.4.5
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri