rbvmomi 1.6.0 → 1.8.0

data/Rakefile

@@ -30,16 +30,16 @@ end
 
 YARD::Rake::YardocTask.new
 
-begin
-  require 'rcov/rcovtask'
-  desc 'Measures test coverage using rcov'
-  Rcov::RcovTask.new do |rcov|
-    rcov.pattern    = 'test/test_*.rb'
-    rcov.output_dir = 'coverage'
-    rcov.verbose    = true
-    rcov.libs << "test"
-    rcov.rcov_opts << '--exclude "gems/*"'
-  end
-rescue LoadError
-  puts "Rcov not available. Install it with: gem install rcov"
-end
+#begin
+#  require 'rcov/rcovtask'
+#  desc 'Measures test coverage using rcov'
+#  Rcov::RcovTask.new do |rcov|
+#    rcov.pattern    = 'test/test_*.rb'
+#    rcov.output_dir = 'coverage'
+#    rcov.verbose    = true
+#    rcov.libs << "test"
+#    rcov.rcov_opts << '--exclude "gems/*"'
+#  end
+#rescue LoadError
+#  puts "Rcov not available. Install it with: gem install rcov"
+#end

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.8.0

data/devel/analyze-vim-declarations.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'nokogiri'
-
+require 'pp'
 # :usage => analyze-vim-declarations.rb vim-declarations.xml foo-declarations.xml vmodl.db
 
 XML_FNS = ARGV[0...-1]
@@ -28,6 +28,7 @@ ID2NAME.merge!({
   'vmodl.DateTime' => 'xsd:dateTime',
   'vmodl.Binary' => 'xsd:base64Binary',
   'vmodl.Any' => 'xsd:anyType',
+  'vmodl.URI' => 'xsd:anyURI',
   'void' => nil,
 })
 
@@ -129,7 +130,9 @@ end
 
 XML_FNS.each do |fn|
   puts "parsing #{fn} ..."
-  xml = Nokogiri.parse(File.read(fn), nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS)
+  xml_str = File.read(fn)
+  xml_str = xml_str.gsub(/\<description-html\>(.*?)\<\/description-html\>/m, "")
+  xml = Nokogiri.parse(xml_str, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS)
   xml.root.at('enums').children.each { |x| handle_enum x }
   xml.root.at('managed-objects').children.each { |x| handle_managed_object x }
   xml.root.at('data-objects').children.each { |x| handle_data_object x }
@@ -137,6 +140,8 @@ XML_FNS.each do |fn|
   #xml.root.at('definitions').at('version-types').children.each { |x| handle_version x }
 end
 
+#pp ID2NAME
+
 munge_fault = lambda { |x| true }
 
 TYPES.each do |k,t|
@@ -159,12 +164,20 @@ TYPES.each do |k,t|
     end
     t['methods'].each do |mName,x|
       if y = x['result']
-        y['wsdl_type'] = ID2NAME[y['type-id-ref']]
+        begin
+          y['wsdl_type'] = ID2NAME[y['type-id-ref']]
+        rescue Exception => ex
+          pp ex
+        end
         y.delete 'type-id-ref'
         munge_fault[y]
       end
       x['params'].each do |r|
-        r['wsdl_type'] = ID2NAME[r['type-id-ref']]
+        begin
+          r['wsdl_type'] = ID2NAME[r['type-id-ref']]
+        rescue Exception => ex
+          pp ex
+        end
         r.delete 'type-id-ref'
         munge_fault[r]
       end

data/devel/merge-internal-vmodl.rb

@@ -46,7 +46,7 @@ internal_vmodl = File.open(internal_vmodl_filename, 'r') { |io| Marshal.load io
 
 TYPES.each do |k|
   puts "Merging in #{k}"
-  fail unless internal_vmodl.member? k
+  fail "Couldn't find type #{k} in internal VMODL" unless internal_vmodl.member? k
   public_vmodl[k] = internal_vmodl[k]
 end
 

data/devel/merge-manual-vmodl.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# Manually merge two versions of vmodl.db
+
+public_vmodl_filename = ARGV[0] or abort "public vmodl filename required"
+internal_vmodl_filename = ARGV[1] or abort "internal vmodl filename required"
+output_vmodl_filename = ARGV[2] or abort "output vmodl filename required"
+
+public_vmodl = File.open(public_vmodl_filename, 'r') { |io| Marshal.load io }
+internal_vmodl = File.open(internal_vmodl_filename, 'r') { |io| Marshal.load io }
+
+db = {}
+tn = {}
+public_vmodl.each do |k,v|
+  unless k == '_typenames'
+    db[k] = v
+  else
+    tn['_typenames'] = v
+  end
+end
+
+internal_vmodl.each do |k, v|
+  unless k == '_typenames'
+    db[k] = v unless db[k]
+  else
+    tn['_typenames'] = tn['_typenames'] + v
+  end
+end
+
+db['_typenames'] = tn
+
+
+File.open(output_vmodl_filename, 'w') { |io| Marshal.dump db, io }

data/lib/rbvmomi/basic_types.rb

@@ -9,7 +9,7 @@ BUILTIN = Set.new %w(ManagedObject DataObject TypeName PropertyPath ManagedObjec
 
 class Base
   class << self
-    attr_reader :wsdl_name
+    attr_accessor :wsdl_name
 
     def init wsdl_name=self.name
       @wsdl_name = wsdl_name
@@ -185,7 +185,9 @@ class ManagedObject < ObjectWithMethods
       :objectSet => [{ :obj => self }],
     }])[0]
 
-    if ret.propSet.empty?
+    if !ret
+      return nil
+    elsif ret.propSet.empty?
       return nil if ret.missingSet.empty?
       raise ret.missingSet[0].fault
     else
@@ -216,7 +218,9 @@ class ManagedObject < ObjectWithMethods
   end
 
   def == x
-    x.class == self.class and x._ref == @ref
+    out = (x.class == self.class && x._ref == @ref) 
+    out = (x._connection.instanceUuid == self._connection.instanceUuid) if out && x._connection.host
+    out
   end
 
   alias eql? ==
@@ -337,6 +341,18 @@ class ::Float
   def self.wsdl_name; 'xsd:float' end
 end
 
+class Int
+  def self.wsdl_name; 'xsd:int' end
+  
+  def initialize x
+    @val = x
+  end
+  
+  def to_s
+    @val.to_s
+  end
+end
+
 class KeyValue
   def self.wsdl_name; 'KeyValue' end
   attr_accessor :key, :value

data/lib/rbvmomi/connection.rb

@@ -115,27 +115,29 @@ 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 or (o.is_a? Hash and expected == BasicTypes::KeyValue))
+    fail "expected array for '#{name}', 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"
+        fail "expected #{expected.wsdl_name} for '#{name}', got KeyValue"
       elsif expected == BasicTypes::KeyValue and not is_array
         xml.tag! name, attrs do
           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
+        fail "expected #{expected.wsdl_name} for '#{name}', got array" unless is_array
         o.each do |e|
           obj2xml xml, name, expected.wsdl_name, false, e, attrs
         end
       end
     when BasicTypes::ManagedObject
-      fail "expected #{expected.wsdl_name}, got #{o.class.wsdl_name} for field #{name.inspect}" if expected and not expected >= o.class and not expected == BasicTypes::AnyType
+      fail "expected #{expected.wsdl_name} for '#{name}', got #{o.class.wsdl_name} for field #{name.inspect}" if expected and not expected >= o.class and not expected == BasicTypes::AnyType
       xml.tag! name, o._ref, :type => o.class.wsdl_name
     when BasicTypes::DataObject
-      fail "expected #{expected.wsdl_name}, got #{o.class.wsdl_name} for field #{name.inspect}" if expected and not expected >= o.class and not expected == BasicTypes::AnyType
+      if expected and not expected >= o.class and not expected == BasicTypes::AnyType
+        fail "expected #{expected.wsdl_name} for '#{name}', got #{o.class.wsdl_name} for field #{name.inspect}"
+      end 
       xml.tag! name, attrs.merge("xsi:type" => o.class.wsdl_name) do
         o.class.full_props_desc.each do |desc|
           if o.props.member? desc['name'].to_sym
@@ -151,11 +153,11 @@ class Connection < TrivialSoap
       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
+        fail "expected #{expected.wsdl_name} for '#{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
+      fail "expected #{expected.wsdl_name} for '#{name}', got a boolean" unless [BasicTypes::Boolean, BasicTypes::AnyType].member? expected
       attrs['xsi:type'] = 'xsd:boolean' if expected == BasicTypes::AnyType
       xml.tag! name, (o ? '1' : '0'), attrs
     when Symbol, String
@@ -178,7 +180,10 @@ class Connection < TrivialSoap
     when Time
       attrs['xsi:type'] = 'xsd:dateTime' if expected == BasicTypes::AnyType
       xml.tag! name, o.iso8601, attrs
-    else fail "unexpected object class #{o.class}"
+    when BasicTypes::Int
+      attrs['xsi:type'] = 'xsd:int'
+      xml.tag! name, o.to_s, attrs
+    else fail "unexpected object class #{o.class} for '#{name}'"
     end
     xml
   rescue
@@ -200,6 +205,11 @@ class Connection < TrivialSoap
     when :base64Binary then BasicTypes::Binary
     when :KeyValue then BasicTypes::KeyValue
     else
+      first_char = name[0].chr
+      if first_char.downcase == first_char
+        name = "%s%s" % [first_char.upcase, name[1..-1]]
+      end
+
       if @loader.has? name
         const_get(name)
       else
@@ -211,6 +221,10 @@ class Connection < TrivialSoap
   def type name
     self.class.type name
   end
+  
+  def instanceUuid
+    nil
+  end
 
   def self.extension_dirs
     @extension_dirs ||= []

data/lib/rbvmomi/deserialization.rb

@@ -64,12 +64,18 @@ class NewDeserializer
       else fail
       end
     else
+      if type =~ /:/
+        type = type.split(":", 2)[1]
+      end
       if type =~ /^ArrayOf/
         type = DEMANGLED_ARRAY_TYPES[$'] || $'
         return node.children.select(&:element?).map { |c| deserialize c, type }
       end
+      if type =~ /:/
+        type = type.split(":", 2)[1]
+      end
 
-      klass = @loader.get(type) or fail "no such type #{type}"
+      klass = @loader.get(type) or fail "no such type '#{type}'"
       case klass.kind
       when :data
         traverse_data node, klass
@@ -226,7 +232,7 @@ class OldDeserializer
   end
 end
 
-if ENV['RBVMOMI_NEW_DESERIALIZER'] == '1'
+if ENV['RBVMOMI_NEW_DESERIALIZER'] == '1' || true # Always use new one now
   Deserializer = NewDeserializer
 else
   Deserializer = OldDeserializer

data/lib/rbvmomi/pbm.rb

@@ -0,0 +1,66 @@
+# Copyright (c) 2012 VMware, Inc.  All Rights Reserved.
+require 'rbvmomi'
+
+module RbVmomi
+
+# A connection to one vSphere ProfileBasedManagement endpoint.
+# @see #serviceInstance
+class PBM < Connection
+  # Connect to a vSphere ProfileBasedManagement endpoint
+  #
+  # @param [VIM] Connection to main vSphere API endpoint
+  # @param [Hash] opts The options hash.
+  # @option opts [String]  :host Host to connect to.
+  # @option opts [Numeric] :port (443) Port to connect to.
+  # @option opts [Boolean] :ssl (true) Whether to use SSL.
+  # @option opts [Boolean] :insecure (false) If true, ignore SSL certificate errors.
+  # @option opts [String]  :path (/pbm/sdk) SDK endpoint path.
+  # @option opts [Boolean] :debug (false) If true, print SOAP traffic to stderr.
+  def self.connect vim, opts = {}
+    fail unless opts.is_a? Hash
+    opts[:host] = vim.host
+    opts[:ssl] = true unless opts.member? :ssl or opts[:"no-ssl"]
+    opts[:insecure] ||= false
+    opts[:port] ||= (opts[:ssl] ? 443 : 80)
+    opts[:path] ||= '/pbm/sdk'
+    opts[:ns] ||= 'urn:pbm'
+    rev_given = opts[:rev] != nil
+    opts[:rev] = '1.0' unless rev_given
+    opts[:debug] = (!ENV['RBVMOMI_DEBUG'].empty? rescue false) unless opts.member? :debug
+
+    new(opts).tap do |pbm|
+      pbm.vcSessionCookie = vim.cookie.split('"')[1]
+    end
+  end
+  
+  def vcSessionCookie= cookie
+    @vcSessionCookie = cookie
+  end
+
+  def rev= x
+    super
+    @serviceContent = nil
+  end
+
+  # Return the ServiceInstance
+  #
+  # The ServiceInstance is the root of the vSphere inventory.
+  def serviceInstance
+    @serviceInstance ||= VIM::PbmServiceInstance self, 'ServiceInstance'
+  end
+
+  # Alias to serviceInstance.PbmRetrieveServiceContent
+  def serviceContent
+    @serviceContent ||= serviceInstance.PbmRetrieveServiceContent
+  end
+
+  # @private
+  def pretty_print pp
+    pp.text "PBM(#{@opts[:host]})"
+  end
+
+  add_extension_dir File.join(File.dirname(__FILE__), "pbm")
+  load_vmodl(ENV['VMODL'] || File.join(File.dirname(__FILE__), "../../vmodl.db"))
+end
+
+end

data/lib/rbvmomi/sms.rb

@@ -0,0 +1,61 @@
+# Copyright (c) 2013 VMware, Inc.  All Rights Reserved.
+require 'rbvmomi'
+module RbVmomi
+
+# A connection to one vSphere SMS endpoint.
+# @see #serviceInstance
+class SMS < Connection
+  # Connect to a vSphere SMS endpoint
+  #
+  # @param [VIM] Connection to main vSphere API endpoint
+  # @param [Hash] opts The options hash.
+  # @option opts [String]  :host Host to connect to.
+  # @option opts [Numeric] :port (443) Port to connect to.
+  # @option opts [Boolean] :ssl (true) Whether to use SSL.
+  # @option opts [Boolean] :insecure (false) If true, ignore SSL certificate errors.
+  # @option opts [String]  :path (/sms/sdk) SDK endpoint path.
+  # @option opts [Boolean] :debug (false) If true, print SOAP traffic to stderr.
+  def self.connect vim, opts = {}
+    fail unless opts.is_a? Hash
+    opts[:host] = vim.host
+    opts[:ssl] = true unless opts.member? :ssl or opts[:"no-ssl"]
+    opts[:insecure] ||= true
+    opts[:port] ||= (opts[:ssl] ? 443 : 80)
+    opts[:path] ||= '/sms/sdk'
+    opts[:ns] ||= 'urn:sms'
+    rev_given = opts[:rev] != nil
+    opts[:rev] = '4.0' unless rev_given
+    opts[:debug] = (!ENV['RBVMOMI_DEBUG'].empty? rescue false) unless opts.member? :debug
+
+    new(opts).tap do |sms|
+      sms.vcSessionCookie = vim.cookie.split('"')[1]
+    end
+  end
+
+  def vcSessionCookie= cookie
+    @vcSessionCookie = cookie
+  end
+
+  def rev= x
+    super
+    @serviceContent = nil
+  end
+
+  # Return the ServiceInstance
+  #
+  # The ServiceInstance is the root of the vSphere inventory.
+  def serviceInstance
+    @serviceInstance ||= VIM::SmsServiceInstance self, 'ServiceInstance'
+  end
+
+  # @private
+  def pretty_print pp
+    pp.text "SMS(#{@opts[:host]})"
+  end
+
+  add_extension_dir File.join(File.dirname(__FILE__), "sms")
+  load_vmodl(ENV['VMODL'] || File.join(File.dirname(__FILE__), "../../vmodl.db"))
+end
+
+end
+

data/lib/rbvmomi/sms/SmsStorageManager.rb

@@ -0,0 +1,7 @@
+class RbVmomi::SMS::SmsStorageManager
+
+  def RegisterProvider_Task2 providerSpec
+     self.RegisterProvider_Task providerSpec
+  end
+
+end

data/lib/rbvmomi/trivial_soap.rb

@@ -14,7 +14,7 @@ class RbVmomi::TrivialSoap
     @opts = opts
     return unless @opts[:host] # for testcases
     @debug = @opts[:debug]
-    @cookie = nil
+    @cookie = @opts[:cookie]
     @lock = Mutex.new
     @http = nil
     restart_http
@@ -62,6 +62,11 @@ class RbVmomi::TrivialSoap
     xsi = 'http://www.w3.org/2001/XMLSchema-instance'
     xml = Builder::XmlMarkup.new :indent => 0
     xml.tag!('env:Envelope', 'xmlns:xsd' => xsd, 'xmlns:env' => env, 'xmlns:xsi' => xsi) do
+      if @vcSessionCookie
+        xml.tag!('env:Header') do
+          xml.tag!('vcSessionCookie', @vcSessionCookie)
+        end
+      end
       xml.tag!('env:Body') do
         yield xml if block_given?
       end