wbem 0.2.0 → 0.2.3

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 0.2.3
+
+* Make #instance_names return generic result
+* Implement #systems, #services, #processes, #networks and #storages
+
+== 0.2.1
+
+* add 'auth_scheme' to client connection
+* support Intel AMT
+
 == 0.2.0
 
 * add 'class_names', supporting WINRM

data/lib/wbem.rb

@@ -16,6 +16,7 @@ module Wbem
   def Wbem.debug= level
     @@debug = (level == 0) ? nil : level
   end
+
   class Client
     require 'uri'
     require 'wbem/wsman'
@@ -30,8 +31,8 @@ module Wbem
     # :wsman  - connect via WS-Management
     # else    - probe connection (cim/xml first)
     #
-    def self.connect uri, protocol = nil
-      STDERR.puts "Wbem::Client.connect(#{uri},#{protocol})"
+    def self.connect uri, protocol = nil, auth_scheme = nil
+      STDERR.puts "Wbem::Client.connect(#{uri},#{protocol},#{auth_scheme})"
       unless uri.is_a?(URI)
         u = URI.parse(uri)
         protocol_given = uri.match(/:\d/)
@@ -39,12 +40,12 @@ module Wbem
         u = uri
         protocol_given = uri.port
       end
-      case protocol
+      case protocol.to_sym
       when :wsman
         unless protocol_given
           u.port = (u.scheme == "http") ? 5985 : 5986
         end
-        return WsmanClient.new u
+        return WsmanClient.new u, auth_scheme
       when :cimxml
         unless protocol_given
           u.port = (u.scheme == "http") ? 5988 : 5989
@@ -54,7 +55,7 @@ module Wbem
       # no connect, check known ports
       case u.port
       when 8888, 8889, 5985, 5986
-        return WsmanClient.new u
+        return WsmanClient.new u, auth_scheme
       when 5988, 5989
         return CimxmlClient.new u
       end
@@ -68,7 +69,7 @@ module Wbem
         if port == 443 && u.scheme == 'https' # https://hostname
           u.port = (protocol == :cimxml) ? 5989: 5986
         end
-        c = Wbem::Client.connect u, protocol
+        c = Wbem::Client.connect u, protocol, auth_scheme
         if c
 #          STDERR.puts "Connect #{u} as #{c}"
           return c

data/lib/wbem/cimxml.rb

@@ -34,9 +34,10 @@ private
   end
 public
 
-  def initialize url
-    super url
-    @client = Sfcc::Cim::Client.connect url
+  def initialize url, auth_scheme = nil
+    super url, auth_scheme
+    STDERR.puts "CIMXML.connect >#{url}<"
+    @client = Sfcc::Cim::Client.connect( { :uri => url, :verify => false } )
     STDERR.puts "CIMXML.connect #{url} -> #{@client}" if Wbem.debug
     _identify
   end
@@ -76,13 +77,16 @@ public
   end
 
   #
-  # Return list of instance_names (object pathes) for given objectpath
+  # Return list of Wbem::EndpointReference (object pathes) for instances
+  #  of namespace, classname
   #
-  def instance_names objectpath
+  def instance_names namespace, classname
+    objectpath = Sfcc::Cim::ObjectPath.new(namespace,classname)
     STDERR.puts "#{@client}.instance_names(#{objectpath})"
     ret = []
     begin
       @client.instance_names(objectpath).each do |path|
+        path.namespace = namespace # add missing data
 	ret << path
       end
     rescue Sfcc::Cim::ErrorInvalidClass, Sfcc::Cim::ErrorInvalidNamespace

data/lib/wbem/version.rb

@@ -1,3 +1,3 @@
 module Wbem
-  VERSION = "0.2.0"
+  VERSION = "0.2.3"
 end

data/lib/wbem/wbem.rb

@@ -16,9 +16,11 @@ module Wbem
 
     attr_reader :url, :response
     attr_reader :product
+    attr_accessor :auth_scheme
 
-    def initialize url
+    def initialize url, auth_scheme = :basic
       @url = (url.is_a? URI) ? url : URI.parse(url)
+      @auth_scheme = auth_scheme.to_s.to_sym
     end
 
     def response_code
@@ -66,8 +68,21 @@ public
       raise "#{self.class}.class_names not implemented"
     end
   
-    def instance_names classname
-      raise "#{self.class}.instance_names not implemented"
+    def systems ns="root/cimv2"
+      instance_names ns, (@product == :winrm) ? "Win32_ComputerSystem" : "CIM_ComputerSystem"
     end
+    def services ns="root/cimv2"
+      instance_names ns, (@product == :winrm) ? "Win32_Service" : "CIM_Service"
+    end
+    def processes ns="root/cimv2"
+      instance_names ns, (@product == :winrm) ? "Win32_Process" : "CIM_Process"
+    end
+    def networks ns="root/cimv2"
+      instance_names ns, (@product == :winrm) ? "Win32_NetworkAdapter" : "CIM_NetworkAdapter"
+    end
+    def storages ns="root/cimv2"
+      instance_names ns, (@product == :winrm) ? "Win32_DiskDrive" : "CIM_DiskDrive"
+    end
+
   end # Class
 end # Module

data/lib/wbem/wsman.rb

@@ -52,21 +52,38 @@ private
   end
 public
 
-  def initialize uri
-    super uri
+  def initialize uri, auth_scheme = nil
+    super uri, auth_scheme
     @url.path = "/wsman" if @url.path.nil? || @url.path.empty?
 #    Openwsman::debug = -1
-    STDERR.puts "WsmanClient connecting to #{uri}" if Wbem.debug
+    STDERR.puts "WsmanClient connecting to #{uri}, auth #{@auth_scheme.inspect}" if Wbem.debug
 
     @client = Openwsman::Client.new @url.to_s
     raise "Cannot create Openwsman client" unless @client
     @client.transport.timeout = 5
     @client.transport.verify_peer = 0
     @client.transport.verify_host = 0
-    # FIXME
-#    @client.transport.auth_method = (@url.scheme == 'http') ? Openwsman::BASIC_AUTH_STR : Openwsman::DIGEST_AUTH_STR
-    @client.transport.auth_method = Openwsman::BASIC_AUTH_STR
+    case @auth_scheme
+    when nil, ""
+      @client.transport.auth_method = nil # negotiate
+    when /none/i
+      @client.transport.auth_method = Openwsman::NO_AUTH_STR
+    when /basic/i
+      @client.transport.auth_method = Openwsman::BASIC_AUTH_STR
+    when /digest/i
+      @client.transport.auth_method = Openwsman::DIGEST_AUTH_STR
+    when /pass/i
+      @client.transport.auth_method = Openwsman::PASS_AUTH_STR
+    when /ntlm/i
+      @client.transport.auth_method = Openwsman::NTLM_AUTH_STR
+    when /gss/i
+      @client.transport.auth_method = Openwsman::GSSNEGOTIATE_AUTH_STR
+    else
+      raise "Unknown auth_scheme #{@auth_scheme.inspect}"
+    end
     @options = Openwsman::ClientOptions.new
+    
+#    STDERR.puts "auth #{@auth_scheme.inspect} -> #{@client.transport.auth_method}"
 
     doc = _identify
 #    STDERR.puts doc.to_xml
@@ -76,7 +93,7 @@ public
     if Wbem.debug
       STDERR.puts "Protocol_version '#{@protocol_version}'"
       STDERR.puts "Product vendor '#{@product_vendor}'"
-      STDERR.puts  "Product version '#{@product_version}'"
+      STDERR.puts "Product version '#{@product_version}'"
     end
     #
     # Windows winrm 2.0
@@ -100,7 +117,7 @@ public
     end
 
     case @product_vendor
-    when "Microsoft Corporation"
+    when /Microsoft/i
       @prefix = "http://schemas.microsoft.com/wbem/wsman/1/wmi/"
       if @product_version =~ /^OS:\s([\d\.]+)\sSP:\s([\d\.]+)\sStack:\s([\d\.]+)$/
         @product_version = $3
@@ -108,9 +125,15 @@ public
         STDERR.puts "Unrecognized product version #{@product_version}"
       end
       @product = :winrm
-    when "Openwsman Project"
+    when /Openwsman/i
       @prefix = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/"
       @product = :openwsman
+    when /Intel/i
+      @prefix = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/"
+      @product = :iamt
+      if @product_version =~ /^AMT\s(\d\.\d)$/
+        @product_version = $1
+      end
     else
       STDERR.puts "Unsupported WS-Management vendor #{@product_vendor}"
       @prefix = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/"
@@ -195,28 +218,25 @@ public
     return classes
   end
 
-  def instance_names object_path
+  def instance_names namespace, classname
     @options.flags = Openwsman::FLAG_ENUMERATION_OPTIMIZATION
     @options.max_elements = 999
-    @options.cim_namespace = object_path.namespace
-    # http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/
-    # CIM=http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2
-    # OpenWBEM=http://schema.openwbem.org/wbem/wscim/1/cim-schema/2
-    # Linux=http://sblim.sf.net/wbem/wscim/1/cim-schema/2
-    # OMC=http://schema.omc-project.org/wbem/wscim/1/cim-schema/2
-    # PG=http://schema.openpegasus.org/wbem/wscim/1/cim-schema/2
-    uri = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/"+object_path.classname
+    @options.cim_namespace = namespace
+    uri = Openwsman::epr_prefix_for(classname, namespace) + "/#{classname}"
     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
-    output = result.body[method]
+
     instances = []
-    output.each do |i|
-      instances << i.to_s
+    result.Items.each do |item|
+      item.add(nil, "namespace", namespace)
+      item.add(nil, "classname", classname)
+      instances << item
     end
     return instances
   end
+  
 end
 end # module

metadata

@@ -1,64 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wbem
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
-- "Klaus K\xC3\xA4mpf"
+authors:
+- Klaus Kämpf
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-10 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &3187880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sfcc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *3187880
+- !ruby/object:Gem::Dependency
+  name: sfcc
+  requirement: &3187220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *3187220
 description: ruby-wbem allows to access a CIMOM transparently through CIM/XML or WS-Management
-email: 
+email:
 - kkaempf@suse.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/wbem.rb
 - lib/wbem/wbem.rb
 - lib/wbem/cimxml.rb
@@ -66,43 +47,29 @@ files:
 - lib/wbem/wsman.rb
 - CHANGELOG.rdoc
 - README.rdoc
-has_rdoc: true
 homepage: http://www.github.com/kkaempf/ruby-wbem
 licenses: []
-
-post_install_message: "  ____\n\
-  /@    ~-.\n\
-  / __ .- | remember to have fun! \n // //  @  \n\n"
+post_install_message: ! "  ____\n/@    ~-.\n/ __ .- | remember to have fun! \n //
+  //  @  \n\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: WBEM client for Ruby based on ruby-sfcc and openwsman
 test_files: []
-