opennebula 6.3.85.pre → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9037eadf643ff9e3cb8745aea4cbfe59d88fec16905216f170123da1670cda30
-  data.tar.gz: 6171ac7fbd6f35e063204eb4a7c35ae4ec5afb0e548d2558623a7095f9a008cf
+  metadata.gz: 266777cd8cbee1a5dd1a31a5a13be7cebb30ea31fb570f250e86879ba3bdbb0e
+  data.tar.gz: 3a60b62aa8040d838ba5a838ee30e53ae3f120e63c9d348329e1ed01e82f982a
 SHA512:
-  metadata.gz: 30d60c2a1447a38a642d4bb93792df47ce39c520a7255fbaa2fd49a445885cc0cd4b28662f9cf45e8d730a3cc7f16db1901489662149a1121c623df35250b5ea
-  data.tar.gz: 5de0e5c492f708e3e56869c6e8b3aea9cfa05c78a5945f84a32884d0a9be5f347e3d35d3b08289c26084a245aa758071a07bf7231e8ef71c7806a97d9e3dbdad
+  metadata.gz: 5b62bafc5c642cef2ba2b3f9e10c656cefe8c65a2c4835f3b9aaceda2b5eec3fc40513abbd77ee592369e805d14a936a925d5168e380e2c94b7e7ec9f9d05d3a
+  data.tar.gz: c10696616d94b1acaf6bc29912d92c331b7ff0f25d543312fbbec802dcfbe466616da36a74537e06f009315d25a762f375aa989910234ecc0bb879c4cb1b667c

data/lib/cloud/CloudClient.rb

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

data/lib/models/role.rb

@@ -65,7 +65,8 @@ module OpenNebula
             'FAILED_DEPLOYING'   => 7,
             'SCALING'            => 8,
             'FAILED_SCALING'     => 9,
-            'COOLDOWN'           => 10
+            'COOLDOWN'           => 10,
+            'HOLD'               => 11
         }
 
         STATE_STR = %w[
@@ -80,6 +81,7 @@ module OpenNebula
             SCALING
             FAILED_SCALING
             COOLDOWN
+            HOLD
         ]
 
         RECOVER_DEPLOY_STATES = %w[
@@ -147,6 +149,7 @@ module OpenNebula
 
             @body['cooldown'] = @@default_cooldown if @body['cooldown'].nil?
             @body['nodes']    ||= []
+            @body['on_hold']  = false if @body['on_hold'].nil?
         end
 
         def name
@@ -195,12 +198,25 @@ module OpenNebula
             true
         end
 
+        def can_release?
+            state == STATE['HOLD']
+        end
+
         # Returns the role parents
         # @return [Array] the role parents
         def parents
             @body['parents'] || []
         end
 
+        def any_parent_on_hold?
+            parents.each do |parent|
+                next unless @service.roles[parent]
+
+                return true if @service.roles[parent].on_hold?
+            end
+            false
+        end
+
         # Returns the role cardinality
         # @return [Integer] the role cardinality
         def cardinality
@@ -357,6 +373,23 @@ module OpenNebula
             @body.delete('scale_way')
         end
 
+        # Returns the on_hold role option
+        # @return [true, false] true if the on_hold option is enabled
+        def on_hold?
+            @body['on_hold']
+        end
+
+        # Returns the on_hold service option
+        # @return [true, false] true if the on_hold option is enabled
+        def service_on_hold?
+            @service.on_hold?
+        end
+
+        # Set the on_hold vm option to true
+        def hold(hold)
+            @body['on_hold'] = hold
+        end
+
         # Retrieves the VM information for each Node in this Role. If a Node
         # is to be disposed and it is found in DONE, it will be cleaned
         #
@@ -436,7 +469,7 @@ module OpenNebula
                           "template #{template_id}, with name #{vm_name}",
                           @service.id
 
-                vm_id = template.instantiate(vm_name, false, extra_template)
+                vm_id = template.instantiate(vm_name, on_hold?, extra_template)
 
                 deployed_nodes << vm_id
 
@@ -546,6 +579,44 @@ module OpenNebula
             [true, nil]
         end
 
+        # Release all the nodes in this role
+        # @return [Array, Bool] true if all the VMs
+        #   were released, false otherwise and Array with VMs released
+        def release
+            release_nodes = []
+            success       = true
+
+            # Release all vms in the role
+            nodes.each do |node|
+                vm_id = node['deploy_id']
+
+                Log.debug(LOG_COMP,
+                          "Role #{name}: Releasing VM #{vm_id}",
+                          @service.id)
+
+                vm = OpenNebula::VirtualMachine.new_with_id(vm_id,
+                                                            @service.client)
+                rc = vm.release
+
+                if OpenNebula.is_error?(rc)
+                    msg = "Role #{name}: Release failed for VM #{vm_id}, " \
+                          "#{rc.message}"
+
+                    Log.error(LOG_COMP, msg, @service.id)
+                    @service.log_error(msg)
+                    success = false
+                else
+                    Log.debug(LOG_COMP,
+                              "Role #{name}: Release success for VM #{vm_id}",
+                              @service.id)
+
+                    release_nodes << vm_id
+                end
+            end
+
+            [release_nodes, success]
+        end
+
         # Schedule the given action on all the VMs that belong to the Role
         # @param [String]  action one of the available SCHEDULE_ACTIONS
         # @param [Integer] period

data/lib/models/service.rb

@@ -38,7 +38,8 @@ module OpenNebula
             'DEPLOYING_NETS'          => 11,
             'UNDEPLOYING_NETS'        => 12,
             'FAILED_DEPLOYING_NETS'   => 13,
-            'FAILED_UNDEPLOYING_NETS' => 14
+            'FAILED_UNDEPLOYING_NETS' => 14,
+            'HOLD'                    => 15
         }
 
         STATE_STR = %w[
@@ -57,6 +58,7 @@ module OpenNebula
             UNDEPLOYING_NETS
             FAILED_DEPLOYING_NETS
             FAILED_UNDEPLOYING_NETS
+            HOLD
         ]
 
         TRANSIENT_STATES = %w[
@@ -216,6 +218,16 @@ module OpenNebula
             self['GID'].to_i
         end
 
+        # Returns the on_hold service option
+        # @return [true, false] true if the on_hold option is enabled
+        def on_hold?
+            @body['on_hold']
+        end
+
+        def hold?
+            state_str == 'HOLD'
+        end
+
         # Replaces this object's client with a new one
         # @param [OpenNebula::Client] owner_client the new client
         def replace_client(owner_client)
@@ -265,6 +277,18 @@ module OpenNebula
             true
         end
 
+        # Returns true if all the nodes are in hold state
+        # @return [true, false] true if all the nodes are in hold state
+        def all_roles_hold?
+            @roles.each do |_name, role|
+                if role.state != Role::STATE['HOLD']
+                    return false
+                end
+            end
+
+            true
+        end
+
         # Returns virtual networks IDs
         # @return [Array] Array of integers containing the IDs
         def networks(deploy)

data/lib/opennebula/flow/service_template.rb

@@ -73,6 +73,10 @@ module OpenNebula
                     :required => false,
                     :minimum => 0
                 },
+                'on_hold' => {
+                    :type => :boolean,
+                    :required => false
+                },
                 'elasticity_policies' => {
                     :type => :array,
                     :items => {
@@ -220,6 +224,10 @@ module OpenNebula
                         :properties => {}
                     },
                     :required => false
+                },
+                'on_hold' => {
+                    :type => :boolean,
+                    :required => false
                 }
             }
         }
@@ -406,9 +414,6 @@ module OpenNebula
                 return rc
             end
 
-            # add registration time, as the template is new
-            body['registration_time'] = Integer(Time.now)
-
             # update the template with the new body
             doc.update(body.to_json)
 

data/lib/opennebula/marketplaceapp_ext.rb

@@ -460,7 +460,11 @@ module OpenNebula::MarketPlaceAppExt
                     end
 
                     if !options[:template] || options[:template] == -1
-                        vmtpl = create_vcenter_template(ds, options)
+                        vmtpl = create_vcenter_template(
+                            ds,
+                            options,
+                            self['TEMPLATE/VMTEMPLATE64']
+                        )
                     else
                         template_id = options[:template]
                         template    = Template.new_with_id(template_id, @client)
@@ -599,6 +603,8 @@ module OpenNebula::MarketPlaceAppExt
                 #   :names      = [name_a, name_b, ...]
                 exported = {}
                 idx      = 0
+                idy      = 0
+                opt_name = ''
 
                 # Store IDs of created resources
                 images    = []
@@ -623,16 +629,35 @@ module OpenNebula::MarketPlaceAppExt
 
                     obj.extend(MarketPlaceAppExt)
 
+                    # Fix name if duplicates exist
+                    imgp = OpenNebula::ImagePool.new(@client)
+                    rc = imgp.info
+                    break rc if OpenNebula.is_error?(rc)
+
+                    img_names = imgp.retrieve_elements('/IMAGE_POOL/IMAGE/NAME')
+
+                    opt_name = options[:name]
+                    t_short = "#{opt_name}-#{obj_name}-#{idx}"
+
+                    if !img_names.nil? && img_names.include?(t_short)
+                        idy = 0
+                        while img_names.include? \
+                            "#{opt_name}_#{idy}-#{obj_name}-#{idx}"
+                            idy += 1
+                        end
+                        opt_name = "#{opt_name}_#{idy}"
+                    end
+
                     rc = obj.export(
                         :dsid       => options[:dsid],
-                        :name       => "#{options[:name]}-#{idx}",
+                        :name       => "#{opt_name}-#{obj_name}-#{idx}",
                         :notemplate => options[:notemplate]
                     )
 
-                    image      = rc[:image].first if rc[:image]
-                    vmtemplate = rc[:vmtemplate].first if rc[:vmtemplate]
-
+                    image = rc[:image].first if rc[:image]
                     break image if OpenNebula.is_error?(image)
+
+                    vmtemplate = rc[:vmtemplate].first if rc[:vmtemplate]
                     break vmtemplate if OpenNebula.is_error?(vmtemplate)
 
                     idx += 1
@@ -676,7 +701,8 @@ module OpenNebula::MarketPlaceAppExt
                          "Error deleting template #{id}"]
                     }
 
-                    delete_method = 'delete(true)'
+                    delete_method = 'delete'
+                    args          = true
                 else
                     obj_factory = lambda {|v|
                         id = v[:image].first
@@ -690,7 +716,13 @@ module OpenNebula::MarketPlaceAppExt
                 exported.each do |_, v|
                     obj, err_msg = obj_factory.call(v)
 
-                    next unless OpenNebula.is_error?(obj.send(delete_method))
+                    if args
+                        rc = obj.send(delete_method, args)
+                    else
+                        rc = obj.send(delete_method)
+                    end
+
+                    next unless OpenNebula.is_error?(rc)
 
                     ret << err_msg
                 end

data/lib/opennebula/oneflow_client.rb

@@ -56,10 +56,7 @@ module Role
         'SCALING'                 => 8,
         'FAILED_SCALING'          => 9,
         'COOLDOWN'                => 10,
-        'DEPLOYING_NETS'          => 11,
-        'UNDEPLOYING_NETS'        => 12,
-        'FAILED_DEPLOYING_NETS'   => 13,
-        'FAILED_UNDEPLOYING_NETS' => 14
+        'HOLD'                    => 11
     }
 
     STATE_STR = [
@@ -74,10 +71,7 @@ module Role
         'SCALING',
         'FAILED_SCALING',
         'COOLDOWN',
-        'DEPLOYING_NETS',
-        'UNDEPLOYING_NETS',
-        'FAILED_DEPLOYING_NETS',
-        'FAILED_UNDEPLOYING_NETS'
+        'HOLD'
     ]
 
     # Returns the string representation of the role state
@@ -105,7 +99,8 @@ module Service
         'DEPLOYING_NETS'          => 11,
         'UNDEPLOYING_NETS'        => 12,
         'FAILED_DEPLOYING_NETS'   => 13,
-        'FAILED_UNDEPLOYING_NETS' => 14
+        'FAILED_UNDEPLOYING_NETS' => 14,
+        'HOLD'                    => 15
     }
 
     STATE_STR = [
@@ -123,7 +118,8 @@ module Service
         'DEPLOYING_NETS',
         'UNDEPLOYING_NETS',
         'FAILED_DEPLOYING_NETS',
-        'FAILED_UNDEPLOYING_NETS'
+        'FAILED_UNDEPLOYING_NETS',
+        'HOLD'
     ]
 
     # Returns the string representation of the service state

data/lib/opennebula/template_ext.rb

@@ -68,6 +68,8 @@ module OpenNebula::TemplateExt
 
                     image = image_lookup(disk)
 
+                    next unless image
+
                     if OpenNebula.is_error?(image)
                         logger.fatal image.message if logger
 
@@ -318,6 +320,9 @@ module OpenNebula::TemplateExt
                     uname = disk['IMAGE_UNAME']
                     uname ||= self['UNAME']
 
+                    # Volatile disk
+                    return unless name
+
                     name.gsub!('"', '')
                     image = @image_lookup_cache.find do |v|
                         v['NAME'] == name && v['UNAME'] == uname

data/lib/opennebula/wait_ext.rb

@@ -138,6 +138,28 @@ module OpenNebula::WaitExt
 
     # Wait classes and the name published in ZMQ/STATE
     WAIT = {
+        OpenNebula::VirtualNetwork  => {
+            :event => lambda {|o, s1, _s2|
+                "EVENT STATE NET/#{s1}//#{o['ID']}"
+            },
+
+            :in_state => lambda {|o, s1, _s2|
+                obj_s = Integer(o['STATE'])
+                inx_s = OpenNebula::VirtualNetwork::VN_STATES.index(s1)
+
+                obj_s == inx_s
+            },
+
+            :in_state_e => lambda {|s1, _s2, content|
+                xml   = Nokogiri::XML(Base64.decode64(content))
+
+                obj_s = Integer(xml.xpath('//VNET/STATE').text)
+                inx_s = OpenNebula::VirtualNetwork::VN_STATES.index(s1)
+
+                obj_s == inx_s
+            }
+        },
+
         OpenNebula::Host  => {
             :event => lambda {|o, s1, _s2|
                 "EVENT STATE HOST/#{s1}//#{o['ID']}"

data/lib/opennebula.rb

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

data/lib/virtual_machine.rb

@@ -1695,6 +1695,34 @@ end
             info_nics
         end
 
+        # Clear extraconfig tags from a vCenter VM
+        #
+        def clear_tags
+            keys_to_remove = extra_config_keys
+
+            spec_hash =
+                keys_to_remove.map {|key| { :key => key, :value => '' } }
+
+            spec = RbVmomi::VIM.VirtualMachineConfigSpec(
+                :extraConfig => spec_hash
+            )
+            @item.ReconfigVM_Task(:spec => spec).wait_for_completion
+        end
+
+        # Get extraconfig tags from a vCenter VM
+        #
+        def extra_config_keys
+            keys_to_remove = []
+            @item['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
+            keys_to_remove
+        end
+
         # Get required parameters to use VMware HTML Console SDK
         # To be used with the following SDK:
         # https://code.vmware.com/web/sdk/2.1.0/html-console
@@ -3388,6 +3416,9 @@ end
             pool.info
 
             src_id = pool["/HOST_POOL/HOST[NAME='#{src_host}']/ID"].to_i
+
+            return if src_id == 0
+
             dst_id = pool["/HOST_POOL/HOST[NAME='#{dst_host}']/ID"].to_i
 
             # different destination ds

data/lib/vm_template.rb

@@ -975,23 +975,14 @@ module VCenterDriver
                 host_id = vi_client.instance_variable_get '@host_id'
 
                 begin
-                    nsx_client =
-                        NSXDriver::NSXClient
-                        .new_from_id(
-                            host_id
-                        )
+                    nsx_client = NSXDriver::NSXClient.new_from_id(host_id)
                 rescue StandardError
                     nsx_client = nil
                 end
 
                 if !nsx_client.nil?
-                    nsx_net =
-                        NSXDriver::VirtualWire
-                        .new_from_name(
-                            nsx_client,
-                            nic[:net_name]
-                        )
-
+                    nsx_net = NSXDriver::VirtualWire
+                              .new_from_name(nsx_client, nic[:net_name])
                     config[:nsx_id] = nsx_net.ls_id
                     config[:nsx_vni] = nsx_net.ls_vni
                     config[:nsx_tz_id] = nsx_net.tz_id
@@ -1002,11 +993,8 @@ module VCenterDriver
                 # so all Standard
                 # PortGroups are networks and no uplinks
                 config[:uplink] = false
-                config[:sw_name] =
-                    VCenterDriver::Network
-                    .virtual_switch(
-                        nic[:network]
-                    )
+                config[:sw_name] = VCenterDriver::Network
+                                   .virtual_switch(nic[:network])
                 # NSX-T PortGroups
             when VCenterDriver::Network::NETWORK_TYPE_NSXT
                 config[:sw_name] = \
@@ -1027,10 +1015,7 @@ module VCenterDriver
                 if !nsx_client.nil?
                     nsx_net =
                         NSXDriver::OpaqueNetwork
-                        .new_from_name(
-                            nsx_client,
-                            nic[:net_name]
-                        )
+                        .new_from_name(nsx_client, nic[:net_name])
 
                     config[:nsx_id] = nsx_net.ls_id
                     config[:nsx_vni] = nsx_net.ls_vni
@@ -1104,6 +1089,31 @@ module VCenterDriver
             VCenterDriver::VIHelper.clean_ref_hash
             one_vn.info
 
+            # Wait until the virtual network is in ready state
+            t_start = Time.now
+            error   = false
+            timeout = 30
+
+            while Time.now - t_start < timeout
+                begin
+                    if one_vn.short_state_str == 'rdy'
+                        error = false
+                        break
+                    end
+                rescue StandardError
+                    error = true
+                end
+
+                sleep 1
+                one_vn.info
+            end
+
+            if error
+                error_msg  = "VNET #{one_vn.id} in state "
+                error_msg += "#{one_vn.short_state_str}, aborting import"
+                raise error_msg
+            end
+
             one_vn
         end
 

data/lib/vmm_importer.rb

@@ -47,6 +47,36 @@ module VCenterDriver
             vm         = selected[:one_item]   || build
             template   = selected[:template]   || import_tmplt
             template = "DEPLOY_ID = #{vm_ref}\n" + template
+
+            # Index where start GRAPHICS block
+            graphics_index = template.index('GRAPHICS = [')
+            unless graphics_index.nil?
+                # Index where finish GRAPHICS block
+                end_of_graphics = template[graphics_index..-1].index(']') + 1
+
+                # GRAPHICS block
+                graphics_sub_string =
+                    template[graphics_index, end_of_graphics]
+
+                # GRAPHICS block with PORT removed
+                # OpenNebula will asing a new not used PORT
+                graphics_sub_string =
+                    graphics_sub_string.gsub(/PORT(.*?),[\r\n]/, '')
+
+                # Index where graphics block finish
+                before_graphics = template[0, graphics_index]
+
+                # Block after graphics block
+                after_graphics =
+                    template[graphics_index..-1][end_of_graphics..-1]
+
+                # Template with out PORT inside GRAPHICS
+                template =
+                    before_graphics +
+                    graphics_sub_string +
+                    after_graphics
+            end
+
             host_id    = selected[:host] || @list.keys[0]
 
             vc_uuid    = @vi_client.vim.serviceContent.about.instanceUuid
@@ -56,6 +86,9 @@ module VCenterDriver
             vc_vm = VCenterDriver::VirtualMachine.new_without_id(@vi_client,
                                                                  vm_ref)
 
+            # clear OpenNebula attributes
+            vc_vm.clear_tags
+
             # Importing Wild VMs with snapshots is not supported
             # https://github.com/OpenNebula/one/issues/1268
             if vc_vm.snapshots? && vc_vm.disk_keys.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.3.85.pre
+  version: 6.4.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -255,9 +255,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: