rbvmomi 1.5.0 → 1.5.1

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/lib/rbvmomi/basic_types.rb

@@ -145,7 +145,8 @@ class DataObject < ObjectWithProperties
       q.text '('
       q.breakable
       props = @props.sort_by { |k,v| k.to_s }
-      q.seplist props, nil, :each do |k, v|
+      q.seplist props, nil, :each do |e|
+        k, v = e
         q.group do
           q.text k.to_s
           q.text ': '
@@ -337,7 +338,7 @@ class ::Float
 end
 
 class KeyValue
-  def self.wsdl_name; 'xsd:float' end
+  def self.wsdl_name; 'KeyValue' end
   attr_accessor :key, :value
 
   def initialize k, v

data/lib/rbvmomi/connection.rb

@@ -115,15 +115,15 @@ class Connection < TrivialSoap
   # hic sunt dracones
   def obj2xml xml, name, type, is_array, o, attrs={}
     expected = type(type)
-    fail "expected array, got #{o.class.wsdl_name}" if is_array and not o.is_a? Array
+    fail "expected array, got #{o.class.wsdl_name}" if is_array and not (o.is_a? Array or (o.is_a? Hash and expected == BasicTypes::KeyValue))
     case o
     when Array, BasicTypes::KeyValue
       if o.is_a? BasicTypes::KeyValue and expected != BasicTypes::KeyValue
         fail "expected #{expected.wsdl_name}, got KeyValue"
-      elsif expected == BasicTypes::KeyValue
+      elsif expected == BasicTypes::KeyValue and not is_array
         xml.tag! name, attrs do
-          xml.tag! 'key', o[0]
-          xml.tag! 'value', o[1]
+          xml.tag! 'key', o[0].to_s
+          xml.tag! 'value', o[1].to_s
         end
       else
         fail "expected #{expected.wsdl_name}, got array" unless is_array
@@ -148,8 +148,12 @@ class Connection < TrivialSoap
     when BasicTypes::Enum
       xml.tag! name, o.value.to_s, attrs
     when Hash
-      fail "expected #{expected.wsdl_name}, got a hash" unless expected <= BasicTypes::DataObject
-      obj2xml xml, name, type, false, expected.new(o), attrs
+      if expected == BasicTypes::KeyValue and is_array
+        obj2xml xml, name, type, is_array, o.to_a, attrs
+      else
+        fail "expected #{expected.wsdl_name}, got a hash" unless expected <= BasicTypes::DataObject
+        obj2xml xml, name, type, false, expected.new(o), attrs
+      end
     when true, false
       fail "expected #{expected.wsdl_name}, got a boolean" unless [BasicTypes::Boolean, BasicTypes::AnyType].member? expected
       attrs['xsi:type'] = 'xsd:boolean' if expected == BasicTypes::AnyType
@@ -208,8 +212,17 @@ class Connection < TrivialSoap
     self.class.type name
   end
 
-  def self.extension_path
-    fail "must be implemented in subclass"
+  def self.extension_dirs
+    @extension_dirs ||= []
+  end
+
+  def self.add_extension_dir dir
+    extension_dirs << dir
+    @loader.reload_extensions_dir dir if @loader
+  end
+
+  def self.reload_extensions
+    @loader.reload_extensions
   end
 
   def self.loader; @loader; end

data/lib/rbvmomi/trivial_soap.rb

@@ -49,7 +49,7 @@ class RbVmomi::TrivialSoap
     end
     @http.set_debug_output(STDERR) if $DEBUG
     @http.read_timeout = 1000000
-    @http.open_timeout = 5
+    @http.open_timeout = 60
     def @http.on_connect
       @socket.io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
     end

data/lib/rbvmomi/type_loader.rb

@@ -25,6 +25,26 @@ class TypeLoader
     names.each { |x| get(x) }
   end
 
+  # Reload all extensions for loaded VMODL types
+  def reload_extensions
+    @extension_dirs.each do |path|
+      reload_extensions_dir path
+    end
+  end
+
+  # Reload all extensions for loaded VMODL types from the given directory
+  def reload_extensions_dir path
+    loaded = Set.new(typenames.select { |x| @namespace.const_defined? x })
+    Dir.open(path) do |dir|
+      dir.each do |file|
+        next unless file =~ /\.rb$/
+        next unless loaded.member? $`
+        file_path = File.join(dir, file)
+        load file_path
+      end
+    end
+  end
+
   def has? name
     fail unless name.is_a? String
     @db.member?(name) or BasicTypes::BUILTIN.member?(name)

data/lib/rbvmomi/vim.rb

@@ -86,12 +86,8 @@ class VIM < Connection
     pp.text "VIM(#{@opts[:host]})"
   end
 
-  @extension_dirs = [File.join(File.dirname(__FILE__), "vim")] + (ENV['RBVMOMI_VIM_EXTENSION_PATH']||'').split(':')
-
-  # Directories to search for extensions
-  def self.extension_dirs
-    @extension_dirs
-  end
+  add_extension_dir File.join(File.dirname(__FILE__), "vim")
+  (ENV['RBVMOMI_VIM_EXTENSION_PATH']||'').split(':').each { |dir| add_extension_dir dir }
 
   load_vmodl(ENV['VMODL'] || File.join(File.dirname(__FILE__), "../../vmodl.db"))
 end

data/lib/rbvmomi/vim/OvfManager.rb

@@ -31,7 +31,7 @@ class RbVmomi::VIM::OvfManager
       :entityName => opts[:vmName],
       :deploymentOption => "",
       :networkMapping => opts[:networkMappings].map{|from, to| RbVmomi::VIM::OvfNetworkMapping(:name => from, :network => to)},
-      :propertyMapping => opts[:propertyMappings].map{|key, value| RbVmomi::VIM::KeyValue(:key => key, :value => value)},
+      :propertyMapping => opts[:propertyMappings].to_a,
       :diskProvisioning => opts[:diskProvisioning]
     )
 
@@ -101,7 +101,7 @@ class RbVmomi::VIM::OvfManager
       vm
     end
   rescue Exception
-    nfcLease.HttpNfcLeaseAbort if nfcLease
+    (nfcLease.HttpNfcLeaseAbort rescue nil) if nfcLease
     raise
   end
 end

data/test/test_serialization.rb

@@ -221,6 +221,60 @@ class SerializationTest < Test::Unit::TestCase
 <root>
   <key>a</key>
   <value>b</value>
+</root>
+    EOS
+
+    obj = [['a', 'b'], ['c', 'd']]
+    check <<-EOS, obj, 'KeyValue', true
+<root>
+  <key>a</key>
+  <value>b</value>
+</root>
+<root>
+  <key>c</key>
+  <value>d</value>
+</root>
+    EOS
+
+    obj = { 'a' => 'b', :c => 'd' }
+    check <<-EOS, obj, 'KeyValue', true
+<root>
+  <key>a</key>
+  <value>b</value>
+</root>
+<root>
+  <key>c</key>
+  <value>d</value>
+</root>
+    EOS
+  end
+
+  def test_ovf_import_spec_params
+    obj = RbVmomi::VIM::OvfCreateImportSpecParams(
+      :hostSystem => VIM::HostSystem(nil, "myhost"),
+      :locale => "US",
+      :entityName => "myvm",
+      :deploymentOption => "",
+      :networkMapping => [],
+      :propertyMapping => [['a', 'b'], ['c', 'd']],
+      :diskProvisioning => :thin
+    )
+
+    check <<-EOS, obj, 'OvfCreateImportSpecParams', false
+<root xsi:type="OvfCreateImportSpecParams">
+  <locale>US</locale>
+  <deploymentOption></deploymentOption>
+  <entityName>myvm</entityName>
+  <hostSystem type="HostSystem">myhost</hostSystem>
+  <propertyMapping>
+    <key>a</key>
+    <value>b</value>
+  </propertyMapping>
+  <propertyMapping>
+    <key>c</key>
+    <value>d</value>
+  </propertyMapping>
+  <diskProvisioning>thin</diskProvisioning>
 </root>
     EOS
   end

metadata

@@ -2,7 +2,7 @@
 name: rbvmomi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Rich Lane
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 -08:00
+date: 2012-03-12 00:00:00 -07:00
 default_executable: rbvmomish
 dependencies: 
 - !ruby/object:Gem::Dependency