opennebula 5.13.80.pre → 6.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc16996ef3b6218367420d87066688a52ee86042
-  data.tar.gz: dae462f84f7ec7bfed459506c56981be1e27974e
+  metadata.gz: f022212cfa3668cae363f0592a9423a77f3f0a63
+  data.tar.gz: f1aa5e2a2d9c2f7d06f8c63defc79b004fdd21a8
 SHA512:
-  metadata.gz: d6a40c0cbf0a2125a07d18348d0d13471562d81581c06318126a7d671025bdcf34a30c5228af30bd37014af65329714ada099de91fcde70db29198b2731c0fc8
-  data.tar.gz: 4a53d311862746b7712066d355120306a5b3d4311315dabf24513f5e20dc509acb4254e5d58556090b768f3aa33e89df2311c10127d87c918f7c0befe2b6c8a1
+  metadata.gz: eb414c6b219cdbcd4217d69219ba161273a1e7ba802fd4c94936a83aba776d2f781661fa684372e77c86fd18d707823cc7f172bc23f2b794dcbb8984cab63b93
+  data.tar.gz: 9d6c490f638e47dcb1f4aa558853806a92b835a9c0217a1bb2a6c84207bd375b4406e13702a4423d733ee4f8294d796a50ecd40045a2f5ca66c046d8eb1a2ede

data/lib/cloud/CloudClient.rb

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

data/lib/datacenter.rb

@@ -500,7 +500,7 @@ module VCenterDriver
         end
 
         # Determine if a network must be excluded from the list
-        def exclude_network?(vc_network, one_host, args, vc_network_hash)
+        def exclude_network?(one_host, args, vc_network_hash, network_type)
             vc_network_name = vc_network_hash[:vc_network_name]
             vc_network_host = vc_network_hash[:vc_network_host]
             vc_network_tag = vc_network_hash[:vc_network_tag]
@@ -514,12 +514,6 @@ module VCenterDriver
                     ]
 
                     # Only NSX-V and NSX-T can be excluded
-                    network_type = VCenterDriver::Network
-                                   .get_network_type(
-                                       vc_network,
-                                       vc_network_name
-                                   )
-
                     return true if network_types.include? network_type
                 end
                 # Exclude networks without hosts
@@ -533,7 +527,7 @@ module VCenterDriver
                     return true
                 end
                 # Exclude portgroup used for VXLAN communication in NSX
-                if vc_network['name'].match(/^vxw-vmknicPg-dvs-(.*)/)
+                if vc_network_name.match(/^vxw-vmknicPg-dvs-(.*)/)
                     return true
                 end
 
@@ -543,7 +537,7 @@ module VCenterDriver
         end
 
         # Proccess each network
-        def process_network(params)
+        def process_network(params, networks_type, hosts_list, host_list_object)
             vc_network = params[:vc_network]
             vcenter_instance_name = params[:vcenter_instance_name]
             vcenter_uuid = params[:vcenter_uuid]
@@ -576,25 +570,32 @@ module VCenterDriver
             # Initialize opts hash used to inject data into one template
             opts = {}
 
-            if full_process
-                # Add network type to network hash
-                network_type = \
+            # Add network type to network hash
+            if networks_type.key?(vc_network_hash[:vc_network_ref])
+                network_type = networks_type[vc_network_hash[:vc_network_ref]]
+            else
+                network_type =
                     VCenterDriver::Network.get_network_type(
                         vc_network,
                         vc_network_name
                     )
-                network[vc_network_ref][:network_type] = network_type
+                networks_type[vc_network_hash[:vc_network_ref]] = network_type
             end
 
+            network[vc_network_ref][:network_type] = network_type
+            network[vc_network_ref][:type] = network_type
+
             # Determine if the network must be excluded
             network[vc_network_ref][:excluded] = exclude_network?(
-                vc_network,
                 one_host,
                 args,
-                vc_network_hash
+                vc_network_hash,
+                network_type
             )
 
-            return if network[vc_network_ref][:excluded] == true
+            if network[vc_network_ref][:excluded] == true
+                return [nil, networks_type, hosts_list, host_list_object]
+            end
 
             if full_process
                 case network[vc_network_ref][:network_type]
@@ -652,31 +653,50 @@ module VCenterDriver
             vc_hosts = vc_network.host
             vc_hosts.each do |vc_host|
                 # Get vCenter Cluster
-                vc_cluster = vc_host.parent
-                vc_cluster_ref = vc_cluster._ref
-                vc_cluster_name = vc_cluster.name
-                # Get one host from each vCenter cluster
-                one_host = VCenterDriver::VIHelper
-                           .find_by_ref(OpenNebula::HostPool,
-                                        'TEMPLATE/VCENTER_CCR_REF',
-                                        vc_cluster_ref,
-                                        vcenter_uuid)
+                vc_host_ref = vc_host._ref
+                if !host_list_object.key?(vc_host_ref)
+                    vc_cluster = vc_host.parent
+                    vc_cluster_ref = vc_cluster._ref
+                    vc_cluster_name = vc_cluster.name
+                    host_list_object[vc_host_ref] = {
+                        :vc_cluster_ref => vc_cluster_ref,
+                        :vc_cluster_name => vc_cluster_name
+                    }
+                end
+
+                vc_cluster = host_list_object[vc_host_ref]
+
+                if hosts_list.key? vc_cluster[:vc_cluster_ref]
+                    one_host = hosts_list[vc_cluster[:vc_cluster_ref]]
+                else
+                    one_host = VCenterDriver::VIHelper
+                               .find_by_ref(OpenNebula::HostPool,
+                                            'TEMPLATE/VCENTER_CCR_REF',
+                                            vc_cluster[:vc_cluster_ref],
+                                            vcenter_uuid)
+                    hosts_list[vc_cluster[:vc_cluster_ref]] = one_host
+                end
                 # Check if network is excluded from each host
                 next if exclude_network?(
-                    vc_network,
                     one_host,
                     args,
-                    vc_network_hash
+                    vc_network_hash,
+                    network_type
                 )
 
                 # Insert vCenter cluster ref
-                network[vc_network_ref][:clusters][:refs] << vc_cluster_ref
+                network[vc_network_ref][:clusters][:refs] <<
+                    vc_cluster[:vc_cluster_ref]
+
                 # Insert OpenNebula cluster id
                 cluster_id = one_cluster_id(one_host)
-                network[vc_network_ref][:clusters][:one_ids] << cluster_id
+                network[vc_network_ref][:clusters][:one_ids] <<
+                    cluster_id
+
                 # Insert vCenter cluster name
-                network[vc_network_ref][:clusters][:names] << vc_cluster_name
-                opts[:dc_name] = vc_cluster_name
+                network[vc_network_ref][:clusters][:names] <<
+                    vc_cluster[:vc_cluster_name]
+                opts[:dc_name] = vc_cluster[:vc_cluster_name]
             end
 
             # Remove duplicate entries
@@ -707,7 +727,7 @@ module VCenterDriver
                     network[vc_network_ref]['name']
             end
 
-            network
+            [network, networks_type, hosts_list, host_list_object]
         end
 
         # rubocop:disable Style/GlobalVars
@@ -724,13 +744,15 @@ module VCenterDriver
                     $conf[:one_xmlrpc]
                 )
             end
-
             one_host = OpenNebula::Host.new_with_id(args[: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 = cluster_networks(one_host)
+            networks_type = {}
+            hosts_list = {}
+            host_list_object = {}
 
             # Iterate over vcenter networks
             vc_cluster_networks.each do |vc_cluster_network|
@@ -752,7 +774,20 @@ module VCenterDriver
                 params[:one_host]= one_host
                 params[:args] = args
 
-                network = process_network(params)
+                network,
+                    networks_type_new,
+                    hosts_list_new,
+                    host_list_object_new =
+                    process_network(
+                        params,
+                        networks_type,
+                        hosts_list,
+                        host_list_object
+                    )
+
+                networks_type = networks_type_new
+                hosts_list = hosts_list_new
+                host_list_object = host_list_object_new
 
                 networks.merge!(network) unless network.nil?
             end

data/lib/datastore.rb

@@ -653,8 +653,8 @@ module VCenterDriver
 
             wout.close
             size = rout.readlines.select do |l|
-                l.start_with?('Content-Length')
-            end[0].sub('Content-Length: ', '')
+                l.downcase.start_with?('content-length')
+            end[0].downcase.sub('content-length: ', '')
             rout.close
             size.chomp.to_i < 4096 # If <4k, then is a descriptor
         end

data/lib/distributed_firewall.rb

@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/network.rb

@@ -486,6 +486,76 @@ 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
+
+                    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] = {}
+
+                    selected, _networks_type, _hosts_list, _clusters_list =
+                        dc_folder.process_network(
+                            params,
+                            {},
+                            {},
+                            {}
+                        )
+
+                    selected = selected[index]
+
+                    # import the object
+                    opts[index] ||= @defaults
+                    @info[:success] << import(selected, opts[index])
+                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 +566,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
@@ -572,8 +642,8 @@ module VCenterDriver
             str
         end
 
-        def import(selected)
-            opts = @info[selected[:ref]][:opts]
+        def import(selected, opts = nil)
+            opts = @info[selected[:ref]][:opts] if opts.nil?
 
             net = VCenterDriver::Network
                   .new_from_ref(selected[:ref], @vi_client)

data/lib/nsx_client.rb

@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsx_constants.rb

@@ -6,7 +6,7 @@
 # a copy of the License at                                                   #
 #                                                                            #
 # http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                             #
+#                                                                            #
 # Unless required by applicable law or agreed to in writing, software        #
 # distributed under the License is distributed on an "AS IS" BASIS,          #
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsx_driver.rb

@@ -36,14 +36,27 @@ end
 
 ENV['LANG'] = 'C'
 
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
 $LOAD_PATH << LIB_LOCATION + '/ruby'
 $LOAD_PATH << LIB_LOCATION + '/ruby/nsx_driver'