opennebula 6.2.2 → 6.3.90.pre

data/lib/vm_template.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -408,13 +408,25 @@ module VCenterDriver
                         break
                     end
 
+                    # Read configuration for imported images, taking
+                    # into account if we are importing a VM Tempalte
+                    # or a Wild VM
+                    image_persistency = nil
+                    if vm?
+                        image_persistency = :wild_vm_persistent_images
+                    else
+                        image_persistency = :vm_template_persistent_images
+                    end
+
+                    image_persistency = VCenterDriver::CONFIG[image_persistency]
+
                     params = {
                         :disk => disk,
                         :ipool => ipool,
                         :_type => type,
                         :ds_id => datastore_found['ID'],
                         :opts => {
-                            :persistent => vm? ? 'YES':'NO'
+                            :persistent => image_persistency ? 'YES':'NO'
                         },
                         :images => images
                     }
@@ -963,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
@@ -990,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] = \
@@ -1015,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
@@ -1092,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.2.2
+  version: 6.3.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-04-28 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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: