opennebula 5.12.13 → 5.13.80.pre

data/lib/transport_zone.rb

@@ -0,0 +1,43 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2021, 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    #
+# 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.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+module NSXDriver
+
+    # Class Transport Zone
+    class TransportZone < NSXComponent
+
+        # ATTRIBUTES
+        attr_reader :tz_id
+
+        def self.new_child(nsx_client)
+            case nsx_client.nsx_type.upcase
+            when NSXConstants::NSXT
+                NSXTtz.new(nsx_client)
+            when NSXConstants::NSXV
+                NSXVtz.new(nsx_client)
+            else
+                error_msg = "Unknown NSX type: #{nsx_client.nsx_type}"
+                error = NSXError::UnknownObject.new(error_msg)
+                raise error
+            end
+        end
+
+        # METHODS
+        # Return the transport zones list
+        def tzs; end
+
+    end
+
+end

data/lib/vcenter_driver.rb

@@ -1,5 +1,5 @@
 # ---------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                  #
+# Copyright 2002-2021, 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      #
@@ -36,25 +36,14 @@ end
 
 ENV['LANG'] = 'C'
 
-# %%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
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
     end
 end
-# %%RUBYGEMS_SETUP_END%%
 
 $LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
 $LOAD_PATH << LIB_LOCATION + '/ruby'
@@ -72,15 +61,15 @@ class VCenterConf < Hash
     }
 
     def initialize
-        super
         replace(DEFAULT_CONFIGURATION)
         begin
             vcenterrc_path = "#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc"
             merge!(YAML.load_file(vcenterrc_path))
         rescue StandardError => e
-            STDERR.puts error_message("Couldn't load vcenterrc. \
-                                       Reason #{e.message}.")
+            STDERR.puts "Couldn't load vcenterrc. Reason #{e.message}."
         end
+
+        super
     end
 
 end
@@ -151,11 +140,9 @@ end
 
 def check_item(item, target_class)
     item.name if CHECK_REFS
-    if target_class
-        if !item.instance_of?(target_class)
-            raise "Expecting type 'RbVmomi::VIM::#{target_class}'. " \
-                    "Got '#{item.class} instead."
-        end
+    if target_class && !item.instance_of?(target_class)
+        raise "Expecting type 'RbVmomi::VIM::#{target_class}'. " \
+              "Got '#{item.class} instead."
     end
 rescue RbVmomi::Fault => e
     raise "Reference \"#{item._ref}\" error [#{e.message}]. \