QMF Fixes in Ruby Console:

  - AgentProxy object now has broker_bank and agent_bank accessors
  - Fixed a bug in the returning og reference values (ObjectId)
  - Added package_name accessor to SchemaObjectClass
  - Added accessors for agent/broker bank to ObjectId


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@821181 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 36 insertions, 9 deletions

diff --git a/cpp/bindings/qmf/ruby/qmf.rb b/cpp/bindings/qmf/ruby/qmf.rb
index f79fb5ed88..fbf95215fd 100644
--- a/cpp/bindings/qmf/ruby/qmf.rb
+++ b/cpp/bindings/qmf/ruby/qmf.rb
@@ -252,7 +252,7 @@ module Qmf
       when TYPE_SSTR, TYPE_LSTR then val.asString
       when TYPE_ABSTIME then val.asInt64
       when TYPE_DELTATIME then val.asUint64
-      when TYPE_REF then val.asObjectId
+      when TYPE_REF then ObjectId.new(val.asObjectId)
       when TYPE_BOOL then val.asBool
       when TYPE_FLOAT then val.asFloat
       when TYPE_DOUBLE then val.asDouble
@@ -463,11 +463,19 @@ module Qmf
     end
 
     def object_num_high
-      return @impl.getObjectNumHi
+      @impl.getObjectNumHi
     end
 
     def object_num_low
-      return @impl.getObjectNumLo
+      @impl.getObjectNumLo
+    end
+
+    def broker_bank
+      @impl.getBrokerBank
+    end
+
+    def agent_bank
+      @impl.getAgentBank
     end
 
     def ==(other)
@@ -522,7 +530,7 @@ module Qmf
       when TYPE_SSTR, TYPE_LSTR                 then val.asString
       when TYPE_ABSTIME                         then val.asInt64
       when TYPE_DELTATIME                       then val.asUint64
-      when TYPE_REF                             then val.asObjectId
+      when TYPE_REF                             then ObjectId.new(val.asObjectId)
       when TYPE_BOOL                            then val.asBool
       when TYPE_FLOAT                           then val.asFloat
       when TYPE_DOUBLE                          then val.asDouble
@@ -796,7 +804,15 @@ module Qmf
       @impl.addMethod(meth.impl)
     end
 
-    def name
+    def class_key
+      SchemaClassKey.new(@impl.getClassKey)
+    end
+
+    def package_name
+      @impl.getClassKey.getPackageName
+    end
+
+    def class_name
       @impl.getClassKey.getClassName
     end
   end
@@ -1027,14 +1043,23 @@ module Qmf
     def label
       @impl.getLabel
     end
+
+    def broker_bank
+      @impl.getBrokerBank
+    end
+
+    def agent_bank
+      @impl.getAgentBank
+    end
   end
 
   class Broker < ConnectionHandler
     include MonitorMixin
-    attr_reader :impl, :conn, :console
+    attr_reader :impl, :conn, :console, :broker_bank
 
     def initialize(console, conn)
       super()
+      @broker_bank = 1
       @console = console
       @conn = conn
       @session = nil
@@ -1281,5 +1306,4 @@ module Qmf
       do_events
     end
   end
-
 end
diff --git a/cpp/bindings/qmf/tests/ruby_console.rb b/cpp/bindings/qmf/tests/ruby_console.rb
index f4420c9fc6..0fa856c724 100755
--- a/cpp/bindings/qmf/tests/ruby_console.rb
+++ b/cpp/bindings/qmf/tests/ruby_console.rb
@@ -25,7 +25,7 @@ require 'socket'
 class App < Qmf::ConsoleHandler
 
   def agent_added(agent)
-    puts "AgentAdded: #{agent.label}"
+    puts "AgentAdded: #{agent.label} broker=#{agent.broker_bank} agent=#{agent.agent_bank}"
   end
 
   def agent_deleted(agent)
@@ -41,7 +41,10 @@ class App < Qmf::ConsoleHandler
   end
 
   def object_update(object, hasProps, hasStats)
-    puts "ObjectUpdate: #{object.object_class.name} props=#{hasProps} stats=#{hasStats}"
+    puts "ObjectUpdate: #{object.object_class.class_name} props=#{hasProps} stats=#{hasStats}"
+    puts "    broker-bank=#{object.object_id.broker_bank}"
+    puts "     agent-bank=#{object.object_id.agent_bank}"
+    puts "        package=#{object.object_class.package_name}"
   end
 
   def event_received(event); end