rbvmomi 1.4.0 → 1.5.0

data/lib/rbvmomi/vim/HostSystem.rb

@@ -6,7 +6,19 @@ class VIM::HostSystem
   end
 
   def dtm
-    @cached_dtm ||= RetrieveDynamicTypeManager()
+    @cached_dtm ||= begin
+        RetrieveDynamicTypeManager()
+      rescue VIM::MethodNotFound
+        if summary.config.product.version >= '4.1.0'
+          if summary.config.product.version < '5.0.0' and direct?
+            VIM::InternalDynamicTypeManager(_connection, 'ha-dynamic-type-manager')
+          else
+            raise "esxcli not supported through VC before 5.0.0"
+          end
+        else
+          raise "esxcli not supported before 4.1.0"
+        end
+      end
   end
 
   def dti

data/lib/rbvmomi/vim/ManagedEntity.rb

@@ -2,39 +2,50 @@ class RbVmomi::VIM::ManagedEntity
   # Retrieve the ancestors of the entity.
   # @return [Array] Ancestors of this entity, starting with the root.
   def path
+    self.class.paths([self])[self]
+  end
+  
+  # Retrieve the ancestors of a list of entries.
+  # @return [Hash] Object-indexed hash of ancestors of entities, starting with the root.
+  def self.paths objs
     filterSpec = RbVmomi::VIM.PropertyFilterSpec(
-      :objectSet => [{
-        :obj => self,
-        :selectSet => [
-          RbVmomi::VIM.TraversalSpec(
-            :name => 'tsME',
-            :type => 'ManagedEntity',
-            :path => 'parent',
-            :skip => false,
-            :selectSet => [
-              RbVmomi::VIM.SelectionSpec(:name => 'tsME')
-            ]
-          )
-        ]
-      }],
+      :objectSet => objs.map do |obj|
+        RbVmomi::VIM.ObjectSpec(
+          :obj => obj,
+          :selectSet => [
+            RbVmomi::VIM.TraversalSpec(
+              :name => "tsME",
+              :type => 'ManagedEntity',
+              :path => 'parent',
+              :skip => false,
+              :selectSet => [
+                RbVmomi::VIM.SelectionSpec(:name => "tsME")
+              ]
+            )
+          ]
+        )
+      end,
       :propSet => [{
         :pathSet => %w(name parent),
         :type => 'ManagedEntity'
       }]
     )
 
-    result = @soap.propertyCollector.RetrieveProperties(:specSet => [filterSpec])
+    propCollector = objs.first._connection.propertyCollector
+    result = propCollector.RetrieveProperties(:specSet => [filterSpec])
 
-    tree = {}
-    result.each { |x| tree[x.obj] = [x['parent'], x['name']] }
-    a = []
-    cur = self
-    while cur
-      parent, name = *tree[cur]
-      a << [cur, name]
-      cur = parent
-    end
-    a.reverse
+    Hash[objs.map do |obj|
+      tree = {}
+      result.each { |x| tree[x.obj] = [x['parent'], x['name']] }
+      a = []
+      cur = obj
+      while cur
+        parent, name = *tree[cur]
+        a << [cur, name]
+        cur = parent
+      end
+      [obj, a.reverse]
+    end]
   end
 
   # Return a string representation of +path+ suitable for display.

data/lib/rbvmomi/vim/ManagedObject.rb

@@ -8,13 +8,13 @@ class RbVmomi::VIM::ManagedObject
   # @todo Pass the current property values to the block.
   def wait_until *pathSet, &b
     all = pathSet.empty?
-    filter = @soap.propertyCollector.CreateFilter :spec => {
+    filter = _connection.propertyCollector.CreateFilter :spec => {
       :propSet => [{ :type => self.class.wsdl_name, :all => all, :pathSet => pathSet }],
       :objectSet => [{ :obj => self }],
     }, :partialUpdates => false
     ver = ''
     loop do
-      result = @soap.propertyCollector.WaitForUpdates(:version => ver)
+      result = _connection.propertyCollector.WaitForUpdates(:version => ver)
       ver = result.version
       if x = b.call
         return x
@@ -35,7 +35,7 @@ class RbVmomi::VIM::ManagedObject
         :type => self.class.wsdl_name
       }]
     }
-    @soap.propertyCollector.RetrieveProperties(:specSet => [spec])[0].to_hash
+    _connection.propertyCollector.RetrieveProperties(:specSet => [spec])[0].to_hash
   end
 
   # Efficiently retrieve multiple properties from an object.

data/lib/rbvmomi/vim/PropertyCollector.rb

@@ -1,5 +1,7 @@
 class RbVmomi::VIM::PropertyCollector
   def collectMultiple objs, *pathSet
+    return {} if objs.empty?
+
     klasses = objs.map{|x| x.class}.uniq 
     klass = if klasses.length > 1
       # common superclass
@@ -7,7 +9,7 @@ class RbVmomi::VIM::PropertyCollector
     else
       klasses.first
     end
-    
+
     spec = {
       :objectSet => objs.map{|x| { :obj => x }},
       :propSet => [{
@@ -20,4 +22,4 @@ class RbVmomi::VIM::PropertyCollector
       [x.obj, x.to_hash]
     end]
   end
-end
+end

data/lib/rbvmomi/vim/ReflectManagedMethodExecuter.rb

@@ -4,7 +4,7 @@ class VIM::ReflectManagedMethodExecuter
   def fetch moid, prop
     result = FetchSoap(:moid => moid, :version => 'urn:vim25/5.0', :prop => prop)
     xml = Nokogiri(result.response)
-    _connection.xml2obj xml.root, nil
+    _connection.deserializer.deserialize xml.root, nil
   end
 
   def execute moid, method, args
@@ -18,7 +18,7 @@ class VIM::ReflectManagedMethodExecuter
     end
     result = ExecuteSoap(:moid => moid, :version => 'urn:vim25/5.0',
                          :method => method, :argument => soap_args)
-    _connection.xml2obj Nokogiri(result.response).root, nil
+    _connection.deserializer.deserialize Nokogiri(result.response).root, nil
   end
 end
 

data/lib/rbvmomi/vim/ResourcePool.rb

@@ -3,7 +3,7 @@ class RbVmomi::VIM::ResourcePool
   # @param name [String] Name of the child.
   # @return [VIM::ResourcePool]
   def find name
-    @soap.searchIndex.FindChild(:entity => self, :name => name)
+    _connection.searchIndex.FindChild(:entity => self, :name => name)
   end
 
   # Retrieve a descendant of this ResourcePool.
@@ -15,4 +15,41 @@ class RbVmomi::VIM::ResourcePool
       f.find(e) || return
     end
   end
+
+  def resourcePoolSubTree fields = []
+    self.class.resourcePoolSubTree [self], fields
+  end
+  
+  def self.resourcePoolSubTree objs, fields = []
+    fields = (fields + ['name', 'resourcePool']).uniq
+    filterSpec = RbVmomi::VIM.PropertyFilterSpec(
+      :objectSet => objs.map do |obj|
+        RbVmomi::VIM.ObjectSpec(
+          :obj => obj,
+          :selectSet => [
+            RbVmomi::VIM.TraversalSpec(
+              :name => "tsRP",
+              :type => 'ResourcePool',
+              :path => 'resourcePool',
+              :skip => false,
+              :selectSet => [
+                RbVmomi::VIM.SelectionSpec(:name => "tsRP")
+              ]
+            )
+          ]
+        )
+      end,
+      :propSet => [{
+        :pathSet => fields,
+        :type => 'ResourcePool'
+      }]
+    )
+  
+    propCollector = objs.first._connection.propertyCollector
+    result = propCollector.RetrieveProperties(:specSet => [filterSpec])
+    
+    Hash[result.map do |x|
+      [x.obj, x.to_hash]
+    end]
+  end
 end

data/lib/rbvmomi/vim/ServiceInstance.rb

@@ -23,14 +23,14 @@ class RbVmomi::VIM::ServiceInstance
     interested = (interested + ['info.state']).uniq
     task_props = Hash.new { |h,k| h[k] = {} }
 
-    filter = @soap.propertyCollector.CreateFilter :spec => {
+    filter = _connection.propertyCollector.CreateFilter :spec => {
       :propSet => [{ :type => 'Task', :all => false, :pathSet => interested }],
       :objectSet => tasks.map { |x| { :obj => x } },
     }, :partialUpdates => false
 
     begin
       until task_props.size == tasks.size and task_props.all? { |k,h| %w(success error).member? h['info.state'] }
-        result = @soap.propertyCollector.WaitForUpdates(:version => version)
+        result = _connection.propertyCollector.WaitForUpdates(:version => version)
         version = result.version
         os = result.filterSet[0].objectSet
 
@@ -46,7 +46,7 @@ class RbVmomi::VIM::ServiceInstance
         yield task_props if block_given?
       end
     ensure
-      @soap.propertyCollector.CancelWaitForUpdates
+      _connection.propertyCollector.CancelWaitForUpdates
       filter.DestroyPropertyFilter
     end
 

data/test/test_deserialization.rb

@@ -1,14 +1,13 @@
-require 'test/unit'
-require 'rbvmomi'
-VIM = RbVmomi::VIM unless Object.const_defined? :VIM
+require 'test_helper'
 
 class DeserializationTest < Test::Unit::TestCase
   def setup
-    @soap = VIM.new(:ns => 'urn:vim25', :rev => '4.0')
+    conn = VIM.new(:ns => 'urn:vim25', :rev => '4.0')
+    @deserializer = RbVmomi::Deserializer.new conn
   end
 
   def check str, expected, type
-    got = @soap.xml2obj Nokogiri(str).root, type
+    got = @deserializer.deserialize Nokogiri(str).root, type
     assert_equal expected, got
   end
 
@@ -37,14 +36,14 @@ class DeserializationTest < Test::Unit::TestCase
 
     check <<-EOS, obj, 'DatastoreSummary'
 <root>
-  <capacity>1000</capacity>
-  <accessible>1</accessible>
   <datastore type="Datastore">foo</datastore>
+  <name>baz</name>
+  <url>http://foo/</url>
+  <capacity>1000</capacity>
   <freeSpace>31</freeSpace>
+  <accessible>1</accessible>
   <multipleHostAccess>false</multipleHostAccess>
-  <name>baz</name>
   <type>VMFS</type>
-  <url>http://foo/</url>
 </root>
     EOS
   end
@@ -292,4 +291,90 @@ end
 </root>
     EOS
   end
+
+  def test_boolean
+    check "<root>1</root>", true, 'xsd:boolean'
+    check "<root>true</root>", true, 'xsd:boolean'
+    check "<root>0</root>", false, 'xsd:boolean'
+    check "<root>false</root>", false, 'xsd:boolean'
+  end
+
+  def test_int
+    check "<root>5</root>", 5, 'xsd:byte'
+    check "<root>5</root>", 5, 'xsd:short'
+    check "<root>5</root>", 5, 'xsd:int'
+    check "<root>5</root>", 5, 'xsd:long'
+  end
+
+  def test_float
+    obj = 1.2
+    check <<-EOS, obj, 'xsd:float'
+<root>1.2</root>
+    EOS
+  end
+
+  def test_date
+    time_str = '2010-08-20T05:44:35.0Z'
+    obj = Time.parse(time_str)
+    check <<-EOS, obj, 'xsd:dateTime'
+<root>#{time_str}</root>
+    EOS
+  end
+
+  def test_array_mangling
+    obj = ["foo"]
+    check <<-EOS, obj, 'ArrayOfString'
+<root><e>foo</e></root>
+    EOS
+
+    time_str = '2010-08-20T05:44:35.0Z'
+    obj = [Time.parse(time_str)]
+    check <<-EOS, obj, 'ArrayOfDateTime'
+<root><e>#{time_str}</e></root>
+    EOS
+
+    obj = [1]
+    check <<-EOS, obj, 'ArrayOfAnyType'
+<root xmlns:xsi="#{VIM::NS_XSI}">
+  <e xsi:type="xsd:int">1</e>
+</root>
+    EOS
+  end
+
+  def test_propertypath
+    check "<root>foo</root>", "foo", 'PropertyPath'
+  end
+
+  def test_methodname
+    check "<root>foo</root>", "foo", 'MethodName'
+  end
+
+  def test_typename
+    check "<root>foo</root>", "foo", 'TypeName'
+  end
+
+  def test_new_fields
+    obj = VIM::HostBlockHba(
+      :dynamicProperty => [],
+      :key => 'key-vim.host.BlockHba-vmhba0',
+      :device => 'vmhba0',
+      :bus => 0,
+      :status => 'unknown',
+      :model => 'Virtual Machine Chipset',
+      :driver => 'ata_piix',
+      :pci => '00:07.1')
+
+    check <<-EOS, obj, "HostBlockHba"
+<hostBusAdapter xsi:type="HostBlockHba">
+  <key>key-vim.host.BlockHba-vmhba0</key>
+  <device>vmhba0</device>
+  <bus>0</bus>
+  <status>unknown</status>
+  <foo>bar</foo>
+  <model>Virtual Machine Chipset</model>
+  <driver>ata_piix</driver>
+  <pci>00:07.1</pci>
+</hostBusAdapter>
+    EOS
+  end
 end

data/test/test_emit_request.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-require 'rbvmomi'
-VIM = RbVmomi::VIM unless Object.const_defined? :VIM
+require 'test_helper'
 
 class EmitRequestTest < Test::Unit::TestCase
   MO = VIM::VirtualMachine(nil, "foo")

data/test/test_exceptions.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-require 'rbvmomi'
-VIM = RbVmomi::VIM unless Object.const_defined? :VIM
+require 'test_helper'
 
 class ExceptionTest < Test::Unit::TestCase
   def test_fault

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+coverage_tool = :simplecov if ENV['RBVMOMI_COVERAGE']
+
+case coverage_tool
+when :simplecov
+  require 'simplecov'
+  SimpleCov.start
+when :cover_me
+  require 'cover_me'
+end
+
+require 'rbvmomi'
+VIM = RbVmomi::VIM
+
+require 'test/unit'

data/test/test_misc.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-require 'rbvmomi'
-VIM = RbVmomi::VIM unless Object.const_defined? :VIM
+require 'test_helper'
 
 class MiscTest < Test::Unit::TestCase
   def test_overridden_const
@@ -16,5 +14,11 @@ class MiscTest < Test::Unit::TestCase
     assert(VIM::ClusterAttemptedVmInfo < RbVmomi::BasicTypes::Base)
     assert_equal 'ClusterAttemptedVmInfo', VIM::ClusterAttemptedVmInfo.wsdl_name
   end
+
+  def test_loader
+    klass = VIM.loader.get('HostSystem')
+    klass2 = VIM::HostSystem
+    assert_equal klass, klass2
+  end
 end
 

data/test/test_parse_response.rb

@@ -1,6 +1,4 @@
-require 'test/unit'
-require 'rbvmomi'
-VIM = RbVmomi::VIM unless Object.const_defined? :VIM
+require 'test_helper'
 
 class ParseResponseTest < Test::Unit::TestCase
   def check desc, str, expected

data/test/test_serialization.rb

@@ -1,12 +1,10 @@
-require 'test/unit'
-require 'rbvmomi'
-VIM = RbVmomi::VIM unless Object.const_defined? :VIM
+require 'test_helper'
 
 class SerializationTest < Test::Unit::TestCase
   def check str, obj, type, array=false
-    @soap = VIM.new(:ns => 'urn:vim25', :rev => '4.0')
+    conn = VIM.new(:ns => 'urn:vim25', :rev => '4.0')
     xml = Builder::XmlMarkup.new :indent => 2
-    @soap.obj2xml(xml, 'root', type, array, obj)
+    conn.obj2xml(xml, 'root', type, array, obj)
 
     begin
       assert_equal str, xml.target!
@@ -226,4 +224,18 @@ class SerializationTest < Test::Unit::TestCase
 </root>
     EOS
   end
+
+  def test_datetime
+    obj = DateTime.new(2011, 11, 16, 13, 36, 8, Rational(-8,24))
+    check <<-EOS, obj, 'xsd:dateTime', false
+<root>2011-11-16T13:36:08-08:00</root>
+    EOS
+  end
+
+  def test_time
+    obj = Time.at DateTime.new(2011, 11, 16, 13, 36, 8, Rational(-8,24)).strftime("%s").to_i
+    check <<-EOS, obj, 'xsd:dateTime', false
+<root>2011-11-16T13:36:08-08:00</root>
+    EOS
+  end
 end