opennebula 5.13.85.pre → 5.13.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a310ceb9e0f7774f113a0c0ad808a4ffeee42c5
-  data.tar.gz: 3024b6d5dbd9fa7c78b2ba1a37dad209a0275945
+  metadata.gz: f9a8c00c023d39dac1d3d0c866851beca57f8b4a
+  data.tar.gz: e44c5056a014e41ba5f2f5f928d36d3bdfcafd15
 SHA512:
-  metadata.gz: f5c51baccf26fda19df4d7a74a70ac8ce9ea0cc93e4b6242294d89c38b2d00c5effcc4ff1d21f7e72527ee2850b087ca57a72e59349dfa4d10d077561927d74d
-  data.tar.gz: 59a563064db5aad4e3f95370d283b1212b103e0ae092ac356f473be97843659d26ab56d7b4ac2e40aed91ffe5571a37addfa7dd4f47bc813c50dfc6b55b04c40
+  metadata.gz: 1efacac3e2a1dc06134672c69f3d563a89d2cdbbb810bd8289c0d7f5e7e7dbd7de1a247fe5976f36d9df796355160b0d1de3f9fb8013c0fe4c3e30116212ab96
+  data.tar.gz: 08304bf5ee0386bbef56d81e6a65668010452130b259ced25a75fdc5693109d7fa667248cb3cec5157636d1c965425fb44dfa043bdadcf821f4f6d3d2f9d1fdb

data/lib/cloud/CloudClient.rb

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

data/lib/datacenter.rb

@@ -576,15 +576,16 @@ module VCenterDriver
             # Initialize opts hash used to inject data into one template
             opts = {}
 
-            if full_process
-                # Add network type to network hash
-                network_type = \
-                    VCenterDriver::Network.get_network_type(
-                        vc_network,
-                        vc_network_name
-                    )
-                network[vc_network_ref][:network_type] = network_type
-            end
+            # if full_process
+            # Add network type to network hash
+            network_type = \
+                VCenterDriver::Network.get_network_type(
+                    vc_network,
+                    vc_network_name
+                )
+            network[vc_network_ref][:network_type] = network_type
+            network[vc_network_ref][:type] = network_type
+            # end
 
             # Determine if the network must be excluded
             network[vc_network_ref][:excluded] = exclude_network?(

data/lib/network.rb

@@ -486,6 +486,79 @@ module VCenterDriver
             @defaults = { :size => '255', :type => 'ether' }
         end
 
+        def process_import(indexes, opts = {}, &block)
+            indexes = indexes.gsub(/\s*\,\s*/, ',').strip.split(',')
+
+            dc_folder = VCenterDriver::DatacenterFolder.new(@vi_client)
+            vcenter_instance_name = @vi_client.vc_name
+            vcenter_uuid = @vi_client.vim.serviceContent.about.instanceUuid
+            hpool = VCenterDriver::VIHelper.one_pool(
+                OpenNebula::HostPool,
+                false
+            )
+
+            one_client = OpenNebula::Client.new
+            one_host = OpenNebula::Host.new_with_id(opts[:host], one_client)
+
+            rc = one_host.info
+            raise rc.message if OpenNebula.is_error? rc
+
+            # Get all networks in vcenter cluster (one_host)
+            vc_cluster_networks = dc_folder.cluster_networks(one_host)
+
+            vc_cluster_networks_map_ref = {}
+
+            # Iterate over vcenter networks
+            vc_cluster_networks.each do |vc_cluster_network|
+                vc_cluster_networks_map_ref[vc_cluster_network._ref] =
+                    vc_cluster_network
+            end
+
+            indexes.each do |index|
+                begin
+                    @rollback = []
+                    @info[index] = {}
+
+                    vc_cluster_network = vc_cluster_networks_map_ref[index]
+
+                    if hpool.respond_to?(:message)
+                        raise 'Could not get OpenNebula HostPool: ' \
+                              "#{hpool.message}"
+                    end
+
+                    opts = {}
+
+                    params = {}
+                    params[:vc_network] = vc_cluster_network
+                    params[:vcenter_instance_name] = vcenter_instance_name
+                    params[:vcenter_uuid] = vcenter_uuid
+                    params[:_hpool] = hpool
+                    params[:one_host] = one_host
+                    params[:args] = opts
+
+                    selected = dc_folder.process_network(params)
+
+                    selected = selected[index]
+
+                    if block_given?
+                        @info[index][:opts] = block.call(selected)
+                    elsif opts[index]
+                        @info[index][:opts] = opts[index]
+                    else
+                        @info[index][:opts] = defaults
+                    end
+
+                    # import the object
+                    @info[:success] << import(selected)
+                rescue StandardError => e
+                    @info[:error] << { index => e.message }
+                    @info[index][:e] = e
+
+                    apply_rollback
+                end
+            end
+        end
+
         def get_list(args = {})
             dc_folder = VCenterDriver::DatacenterFolder.new(@vi_client)
 
@@ -496,8 +569,8 @@ module VCenterDriver
                         false
                     )
             if npool.respond_to?(:message)
-                raise "Could not get \
-                OpenNebula VirtualNetworkPool: #{npool.message}"
+                raise 'Could not get ' \
+                "OpenNebula VirtualNetworkPool: #{npool.message}"
             end
 
             # Get OpenNebula's host pool

data/lib/opennebula.rb

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

data/lib/vm_template.rb

@@ -625,8 +625,8 @@ module VCenterDriver
                     nic_tmp << "NETWORK_ID=\"#{id}\",\n"
                     nic_tmp << "IP=\"#{ipv4_additional}\",\n"
                     nic_tmp <<
-                        "NAME=\"NIC#{nic_index}_ALIAS#{nic_alias_index}\",\n"
-                    nic_tmp << "PARENT=\"NIC#{nic_index}\"\n"
+                        "NAME=\"VC_NIC#{nic_index}_ALIAS#{nic_alias_index}\",\n"
+                    nic_tmp << "PARENT=\"VC_NIC#{nic_index}\"\n"
                     nic_tmp << "]\n"
                     nic_alias_index += 1
                 end
@@ -653,8 +653,8 @@ module VCenterDriver
                     nic_tmp << "NETWORK_ID=\"#{id}\",\n"
                     nic_tmp << "IP6=\"#{ipv6_additional}\",\n"
                     nic_tmp <<
-                        "NAME=\"NIC#{nic_index}_ALIAS#{nic_alias_index}\",\n"
-                    nic_tmp << "PARENT=\"NIC#{nic_index}\"\n"
+                        "NAME=\"VC_NIC#{nic_index}_ALIAS#{nic_alias_index}\",\n"
+                    nic_tmp << "PARENT=\"VC_NIC#{nic_index}\"\n"
                     nic_tmp << "]\n"
                     nic_alias_index += 1
                 end
@@ -666,7 +666,7 @@ module VCenterDriver
         def nic_from_network_created(one_vn, nic, nic_index, vm_object, _ar_ids)
             nic_tmp = "NIC=[\n"
             nic_tmp << "NETWORK_ID=\"#{one_vn.id}\",\n"
-            nic_tmp << "NAME =\"NIC#{nic_index}\",\n"
+            nic_tmp << "NAME =\"VC_NIC#{nic_index}\",\n"
 
             if vm?
                 if nic[:mac]
@@ -716,7 +716,7 @@ module VCenterDriver
         )
             nic_tmp = "NIC=[\n"
             nic_tmp << "NETWORK_ID=\"#{network_found['ID']}\",\n"
-            nic_tmp << "NAME =\"NIC#{nic_index}\",\n"
+            nic_tmp << "NAME =\"VC_NIC#{nic_index}\",\n"
 
             if vm?
                 ipv4, ipv6 = find_ips_in_network(network_found, vm_object,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.13.85.pre
+  version: 5.13.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri