Removed references to broker and agent bank from API, replaced with the

more generic (and forward compatible) "key".

In the Ruby binding, ensured that ruby objects reference their own copies
of the wrapped c++ objects to protect from problems when the c++ objects are
deleted out from under the wrappers.

Added agent discriminator to the console::objects method.


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

2 files changed, 15 insertions, 3 deletions

diff --git a/qpid/cpp/bindings/qmf/tests/ruby_console.rb b/qpid/cpp/bindings/qmf/tests/ruby_console.rb
index a76099f83a..31670312d6 100755
--- a/qpid/cpp/bindings/qmf/tests/ruby_console.rb
+++ b/qpid/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} broker=#{agent.broker_bank} agent=#{agent.agent_bank}"
+    puts "AgentAdded: label=#{agent.label} key=#{agent.key}"
   end
 
   def agent_deleted(agent)
@@ -42,8 +42,7 @@ class App < Qmf::ConsoleHandler
 
   def object_update(object, hasProps, 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 "      agent-key=#{object.object_id.agent_key}"
     puts "        package=#{object.object_class.package_name}"
   end
 
diff --git a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
index e0440367c5..98180a97cd 100755
--- a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
+++ b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
@@ -201,6 +201,19 @@ class ConsoleTest < ConsoleTestBase
     
   end
 
+  def test_D_get_with_agent
+    agents = @qmfc.agents
+    agents.each do |agent|
+      if agent.label == "qmfa"
+        parent = @qmfc.object(:class => "parent", :agent => agent)
+        assert(parent, "Number of parent objects")
+        return
+      end
+    end
+
+    fail("Didn't find a non-broker agent")
+  end
+
 end
 
 app = ConsoleTest.new