opennebula 6.3.85.pre → 6.3.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9037eadf643ff9e3cb8745aea4cbfe59d88fec16905216f170123da1670cda30
-  data.tar.gz: 6171ac7fbd6f35e063204eb4a7c35ae4ec5afb0e548d2558623a7095f9a008cf
+  metadata.gz: ce0ca66d3a7fc700e855f98615b22498966c4efb6321770afc9e5852d29359c2
+  data.tar.gz: 7879f4859708352f9d1a69edd76ed6131ec8c3a26470ebea6933fb02317f948f
 SHA512:
-  metadata.gz: 30d60c2a1447a38a642d4bb93792df47ce39c520a7255fbaa2fd49a445885cc0cd4b28662f9cf45e8d730a3cc7f16db1901489662149a1121c623df35250b5ea
-  data.tar.gz: 5de0e5c492f708e3e56869c6e8b3aea9cfa05c78a5945f84a32884d0a9be5f347e3d35d3b08289c26084a245aa758071a07bf7231e8ef71c7806a97d9e3dbdad
+  metadata.gz: ff3757f8da05cd268b1fcdd153e9e1dabb502ac3269567d2d66c1161e0d5014641d0ccd2776a8cb6b924a6d076d01b28730a38d4095c3655d14728805120450a
+  data.tar.gz: ede0e55b1b5b3423e22dc73832ead4e300857c41551f79cd921d427aaba9e1a331f1f8763ef8fecbe3bdcad8cc8a122ba8ba1b4aec0f4c51bd3c0486178c06c8

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.3.85'
+    VERSION = '6.3.90'
 
     # #########################################################################
     # 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
                 }
             }
         }

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.rb

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

data/lib/virtual_machine.rb

@@ -3388,6 +3388,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.3.85.pre
+  version: 6.3.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri