wbem 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.1.1
+
+* Unify 'identify'
+* Add Client#product
+
 == 0.1.0
 
 * First public version

data/lib/wbem.rb

@@ -1,3 +1,13 @@
+#
+# wbem.rb
+#
+# A CIM client abstraction layer on top of sfcc (cim/xml) and openwsman (WS-Management)
+#
+# Copyright (c) 2011, SUSE Linux Products GmbH
+# Written by Klaus Kaempf <kkaempf@suse.de>
+#
+# Licensed under the MIT license
+#
 module Wbem
   @@debug = nil
   def Wbem.debug
@@ -11,8 +21,6 @@ module Wbem
     require 'wbem/wsman'
     require 'wbem/cimxml'
 
-    attr_reader :url, :response
-
     #
     # Wbem::Client.connect uri, protocol = nil
     #
@@ -23,15 +31,26 @@ module Wbem
     # else    - probe connection (cim/xml first)
     #
     def self.connect uri, protocol = nil
-      STDERR.puts "Wbem::Client.connect(#{uri},#{protocol})" if Wbem.debug
-      u = uri.is_a?(URI) ? uri : URI.parse(uri)
+      STDERR.puts "Wbem::Client.connect(#{uri},#{protocol})"
+      unless uri.is_a?(URI)
+        u = URI.parse(uri)
+        protocol_given = uri.match(/:\d/)
+      else
+        u = uri
+        protocol_given = uri.port
+      end
       case protocol
       when :wsman
+        unless protocol_given
+          u.port = (u.scheme == "http") ? 5985 : 5986
+        end
         return WsmanClient.new u
       when :cimxml
+        unless protocol_given
+          u.port = (u.scheme == "http") ? 5988 : 5989
+        end
         return CimxmlClient.new u
       end
-      STDERR.puts "no connect, check known ports"
       # no connect, check known ports
       case u.port
       when 8888, 8889, 5985, 5986
@@ -39,7 +58,7 @@ module Wbem
       when 5988, 5989
         return CimxmlClient.new u
       end
-      STDERR.puts "no known ports"
+#      STDERR.puts "no known ports"
       port = u.port # keep orig port as we change u.port below
       [:wsman, :cimxml].each do |protocol|
         # enforce port if uri provides scheme and host only
@@ -51,7 +70,7 @@ module Wbem
         end
         c = Wbem::Client.connect u, protocol
         if c
-          STDERR.puts "Connect #{u} as #{c}"
+#          STDERR.puts "Connect #{u} as #{c}"
           return c
         end
       end

data/lib/wbem/cimxml.rb

@@ -12,30 +12,44 @@ require "wbem/wbem"
 module Wbem
 class CimxmlClient < WbemClient
   require "sfcc"
+private
+  #
+  # identify client
+  # return identification string
+  # on error return nil and set @response to http response code
+  #
+  def _identify
+    # sfcb has /root/interop:CIM_ObjectManager
+    sfcb_op = objectpath "root/interop", "CIM_ObjectManager"
+    STDERR.puts "Looking for #{sfcb_op}"
+    begin
+      @client.instances(sfcb_op).each do |inst|
+        @product = inst.Description
+        break
+      end
+    rescue Sfcc::Cim::ErrorInvalidClass, Sfcc::Cim::ErrorInvalidNamespace
+      # not sfcb
+      raise "Unknown CIMOM"
+    end
+  end
+public
 
   def initialize url
     super url
     @client = Sfcc::Cim::Client.connect url
+    STDERR.puts "CIMXML.connect #{url} -> #{@client}" if Wbem.debug
+    _identify
   end
   
   def objectpath namespace, classname = nil
     Sfcc::Cim::ObjectPath.new(namespace, classname)
   end
 
-  #
-  # identify client
-  # return identification string
-  # on error return nil and set @response to http response code
-  #
-  def identify
-    "CIM/XML client at #{@url.host}:#{@url.port}"
-  end
-
   #
   # Return instances for namespace and classname
   #
   def each_instance( ns, cn )
-    op = Sfcc::Cim::ObjectPath.new(ns, cn)
+    op = objectpath ns, cn
     begin
       @client.instances(op).each do |inst|
         yield inst
@@ -76,4 +90,4 @@ class CimxmlClient < WbemClient
     ret
   end
 end # class
-end # module
+end # module

data/lib/wbem/version.rb

@@ -1,3 +1,3 @@
 module Wbem
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/wbem/wbem.rb

@@ -15,6 +15,7 @@ module Wbem
     require 'uri'
 
     attr_reader :url, :response
+    attr_reader :product
 
     def initialize url
       @url = (url.is_a? URI) ? url : URI.parse(url)

data/lib/wbem/wsman.rb

@@ -31,6 +31,27 @@ end
 
 module Wbem
 class WsmanClient < WbemClient
+private
+  #
+  # WS-Identify
+  # returns Openwsman::XmlDoc
+  #
+  def _identify
+    STDERR.puts "Identify client #{@client} with #{@options}" if Wbem.debug
+    doc = @client.identify( @options )
+    unless doc
+      raise RuntimeError.new "Identify failed: HTTP #{@client.response_code}, Err #{@client.last_error}:#{@client.fault_string}"
+    end
+    if doc.fault?
+      fault = doc.fault
+      STDERR.puts "Fault: #{fault.to_xml}"
+      raise fault.to_s
+    end
+#    STDERR.puts "Return #{doc.to_xml}"
+    doc
+  end
+public
+
   def initialize uri
     super uri
     @url.path = "/wsman" if @url.path.nil? || @url.path.empty?
@@ -47,7 +68,7 @@ class WsmanClient < WbemClient
     @client.transport.auth_method = Openwsman::BASIC_AUTH_STR
     @options = Openwsman::ClientOptions.new
 
-    doc = identify
+    doc = _identify
 #    STDERR.puts doc.to_xml
     @protocol_version = doc.ProtocolVersion.text
     @product_vendor = doc.ProductVendor.text
@@ -103,25 +124,6 @@ class WsmanClient < WbemClient
     Openwsman::ObjectPath.new classname, namespace
   end
 
-  #
-  # WS-Identify
-  # returns Openwsman::XmlDoc
-  #
-  def identify
-    STDERR.puts "Identify client #{@client} with #{@options}" if Wbem.debug
-    doc = @client.identify( @options )
-    unless doc
-      raise RuntimeError.new "Identify failed: HTTP #{@client.response_code}, Err #{@client.last_error}:#{@client.fault_string}"
-    end
-    if doc.fault?
-      fault = doc.fault
-      STDERR.puts "Fault: #{fault.to_xml}"
-      raise fault.to_s
-    end
-#    STDERR.puts "Return #{doc.to_xml}"
-    doc
-  end
-  
   def each_instance( ns, cn )
     @options.flags = Openwsman::FLAG_ENUMERATION_OPTIMIZATION
     @options.max_elements = 999

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wbem
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Klaus K\xC3\xA4mpf"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 +01:00
+date: 2012-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,22 @@ dependencies:
         version: "0.5"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sfcc
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  type: :runtime
+  version_requirements: *id002
 description: ruby-wbem allows to access a CIMOM transparently through CIM/XML or WS-Management
 email: 
 - kkaempf@suse.de