wbem 0.2.5 → 0.2.6

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.2.6
+
+* Honor iAMT when choosing classnames
+* Detect client connection vs client protocol errors
+* Use optimized enumerations
+
 == 0.2.5
 
 * Bugfix release

data/lib/wbem/version.rb

@@ -1,3 +1,3 @@
 module Wbem
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/wbem/wbem.rb

@@ -68,20 +68,56 @@ public
       raise "#{self.class}.class_names not implemented"
     end
   
+    def system_class_name
+      case @product
+      when :winrm then "Win32_ComputerSystem"
+      else
+        "CIM_ComputerSystem"
+      end
+    end
     def systems ns="root/cimv2"
-      instance_names ns, (@product == :winrm) ? "Win32_ComputerSystem" : "CIM_ComputerSystem"
+      ns = "" if @product == :iamt
+      instance_names ns, system_class_name
+    end
+    
+    def service_class_name
+      case @product
+      when :winrm then "Win32_Service"
+      else
+        "CIM_Service"
+      end
     end
     def services ns="root/cimv2"
-      instance_names ns, (@product == :winrm) ? "Win32_Service" : "CIM_Service"
+      ns = "" if @product == :iamt
+      instance_names ns, service_class_name
     end
     def processes ns="root/cimv2"
+      ns = "" if @product == :iamt
       instance_names ns, (@product == :winrm) ? "Win32_Process" : "CIM_Process"
     end
+    def network_class_name
+      case @product
+      when :winrm then "Win32_NetworkAdapter"
+      when :iamt then "CIM_NetworkPort"
+      else
+        "CIM_NetworkAdapter"
+      end
+    end
     def networks ns="root/cimv2"
-      instance_names ns, (@product == :winrm) ? "Win32_NetworkAdapter" : "CIM_NetworkAdapter"
+      ns = "" if @product == :iamt
+      instance_names ns, network_class_name
+    end
+    def storage_class_name
+      case @product
+      when :winrm then "Win32_DiskDrive"
+      when :iamt then "CIM_StorageExtent"
+      else
+        "CIM_DiskDrive"
+      end
     end
     def storages ns="root/cimv2"
-      instance_names ns, (@product == :winrm) ? "Win32_DiskDrive" : "CIM_DiskDrive"
+      ns = "" if @product == :iamt
+      instance_names ns, storage_class_name
     end
 
   end # Class

data/lib/wbem/wsman.rb

@@ -41,6 +41,26 @@ end
 module Wbem
 class WsmanClient < WbemClient
 private
+  #
+  # Handle client connection or protocol fault
+  #
+  # @return: true if fault
+  #
+  def _handle_fault client, result
+    if result.nil?
+      STDERR.puts "Client connection failed:\n\tResult code #{@client.response_code}, Fault: #{@client.fault_string}"
+      return true
+    end
+    if result.fault?
+      fault = Openwsman::Fault.new result
+      STDERR.puts "Client protocol failed for (#{uri})"
+      STDERR.puts "\tFault code #{fault.code}, subcode #{fault.subcode}"
+      STDERR.puts "\t\treason #{fault.reason}"
+      STDERR.puts "\t\tdetail #{fault.detail}"
+      return true
+    end
+    false
+  end
   #
   # WS-Identify
   # returns Openwsman::XmlDoc
@@ -161,19 +181,26 @@ public
     @options.max_elements = 999
     resource = "#{@prefix}#{ns}/#{cn}"
     result = @client.enumerate( @options, nil, resource )
-    return unless result
-#    STDERR.puts "Result '#{result.to_xml}'"
-    return if result.fault?
-    items = result.body.EnumerateResponse.Items rescue nil
-    items.each do |inst|
-      yield inst
-    end if items
+    loop do
+      if _handle_fault @client, result
+        break
+      end
+      items = result.Items rescue nil
+      if items
+        items.each do |inst|
+          yield inst
+        end
+      end
+      context = result.context
+      break unless context
+      result = @client.pull( @options, nil, resource, context )
+    end
   end
 
   def class_names namespace, deep_inheritance = false
     @options.flags = Openwsman::FLAG_ENUMERATION_OPTIMIZATION
     @options.max_elements = 999
-    @options.cim_namespace = namespace
+    @options.cim_namespace = namespace if @product == :openwsman
     case @product
     when :openwsman
       unless @product_version >= "2.2"
@@ -196,8 +223,7 @@ public
       raise "Unsupported for WSMAN product #{@product}"
     end
     
-    if result.fault?
-      puts "Enumerate class names (#{uri}) failed:\n\tResult code #{@client.response_code}, Fault: #{@client.fault_string}"
+    if _handle_fault @client, result
       return []
     end
     
@@ -221,7 +247,7 @@ public
         break unless context
         # get the next chunk
         result = @client.pull( @options, nil, uri, context)
-        break unless result
+        break if _handle_fault
       end
     end
     return classes
@@ -231,18 +257,26 @@ public
     @options.flags = Openwsman::FLAG_ENUMERATION_ENUM_EPR # get EPRs
     @options.flags = Openwsman::FLAG_ENUMERATION_OPTIMIZATION
     @options.max_elements = 999
-    @options.cim_namespace = namespace
+    @options.cim_namespace = namespace if @product == :openwsman
+    @options.set_dump_request
     uri = Openwsman::epr_prefix_for(classname, namespace) + "/#{classname}"
+    STDERR.puts "instance_names enumerate (#{uri})"
     result = @client.enumerate( @options, nil, uri )
-    if result.fault?
-      puts "Enumerate instances (#{uri}) failed:\n\tResult code #{@client.response_code}, Fault: #{@client.fault_string}"
-      return []
-    end
-
     names = []
-    # expect <n:Item><a:EndpointReference>...
-    result.Items.each do |epr|
-      names << Openwsman::EndPointReference.new(epr)
+    loop do
+      if _handle_fault @client, result
+        break
+      end
+      items = result.Items
+      if items
+        # expect <n:Item><a:EndpointReference>...
+        items.each do |epr|
+          names << Openwsman::EndPointReference.new(epr)
+        end
+      end
+      context = result.context
+      break unless context
+      result = @client.pull( @options, nil, uri, context )
     end
     return names
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wbem
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &5664600 !ruby/object:Gem::Requirement
+  requirement: &5664140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *5664600
+  version_requirements: *5664140
 - !ruby/object:Gem::Dependency
   name: sfcc
-  requirement: &5663140 !ruby/object:Gem::Requirement
+  requirement: &5663580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *5663140
+  version_requirements: *5663580
 - !ruby/object:Gem::Dependency
   name: openwsman
-  requirement: &5653060 !ruby/object:Gem::Requirement
+  requirement: &5662940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *5653060
+  version_requirements: *5662940
 description: ruby-wbem allows to access a CIMOM transparently through CIM/XML or WS-Management
 email:
 - kkaempf@suse.de