QMF Console

  - Added implementation for method invocation
  - Added metaprogramming hooks in Ruby for attribute and method access
  - Refactored file structure


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

2 files changed, 55 insertions, 40 deletions

diff --git a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
index 67591319ee..2f0869ad73 100755
--- a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
+++ b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
@@ -92,37 +92,37 @@ class App < Qmf::AgentHandler
       retText = "OK"
 
       if args['test'] == "big"
-        @parent.set_attr("uint64val", 0x9494949449494949)
-        @parent.set_attr("uint32val", 0xa5a55a5a)
-        @parent.set_attr("uint16val", 0xb66b)
-        @parent.set_attr("uint8val",  0xc7)
+        @parent.uint64val = 0x9494949449494949
+        @parent.uint32val = 0xa5a55a5a
+        @parent.uint16val = 0xb66b
+        @parent.uint8val  =  0xc7
 
-        @parent.set_attr("int64val", 1000000000000000000)
-        @parent.set_attr("int32val", 1000000000)
-        @parent.set_attr("int16val", 10000)
-        @parent.set_attr("int8val",  100)
+        @parent.int64val = 1000000000000000000
+        @parent.int32val = 1000000000
+        @parent.int16val = 10000
+        @parent.int8val  = 100
 
       elsif args['test'] == "small"
-        @parent.set_attr("uint64val", 4)
-        @parent.set_attr("uint32val", 5)
-        @parent.set_attr("uint16val", 6)
-        @parent.set_attr("uint8val",  7)
+        @parent.uint64val = 4
+        @parent.uint32val = 5
+        @parent.uint16val = 6
+        @parent.uint8val  = 7
 
-        @parent.set_attr("int64val", 8)
-        @parent.set_attr("int32val", 9)
-        @parent.set_attr("int16val", 10)
-        @parent.set_attr("int8val",  11)
+        @parent.int64val = 8
+        @parent.int32val = 9
+        @parent.int16val = 10
+        @parent.int8val  = 11
 
       elsif args['test'] == "negative"
-        @parent.set_attr("uint64val", 0)
-        @parent.set_attr("uint32val", 0)
-        @parent.set_attr("uint16val", 0)
-        @parent.set_attr("uint8val",  0)
+        @parent.uint64val = 0
+        @parent.uint32val = 0
+        @parent.uint16val = 0
+        @parent.uint8val  = 0
 
-        @parent.set_attr("int64val", -10000000000)
-        @parent.set_attr("int32val", -100000)
-        @parent.set_attr("int16val", -1000)
-        @parent.set_attr("int8val",  -100)
+        @parent.int64val = -10000000000
+        @parent.int32val = -100000
+        @parent.int16val = -1000
+        @parent.int8val  = -100
 
       else
         retCode = 1
@@ -135,7 +135,7 @@ class App < Qmf::AgentHandler
       oid = @agent.alloc_object_id(2)
       args['child_ref'] = oid
       @child = Qmf::AgentObject.new(@model.child_class)
-      @child.set_attr("name", args.by_key("child_name"))
+      @child.name = args.by_key("child_name")
       @child.set_object_id(oid)
       @agent.method_response(context, 0, "OK", args)
 
@@ -161,18 +161,18 @@ class App < Qmf::AgentHandler
     @agent.set_connection(@connection)
 
     @parent = Qmf::AgentObject.new(@model.parent_class)
-    @parent.set_attr("name", "Parent One")
-    @parent.set_attr("state", "OPERATIONAL")
-
-    @parent.set_attr("uint64val", 0)
-    @parent.set_attr("uint32val", 0)
-    @parent.set_attr("uint16val", 0)
-    @parent.set_attr("uint8val",  0)
-
-    @parent.set_attr("int64val", 0)
-    @parent.set_attr("int32val", 0)
-    @parent.set_attr("int16val", 0)
-    @parent.set_attr("int8val",  0)
+    @parent.name  = "Parent One"
+    @parent.state = "OPERATIONAL"
+
+    @parent.uint64val = 0
+    @parent.uint32val = 0
+    @parent.uint16val = 0
+    @parent.uint8val  = 0
+
+    @parent.int64val = 0
+    @parent.int32val = 0
+    @parent.int16val = 0
+    @parent.int8val  = 0
 
     @parent_oid = @agent.alloc_object_id(1)
     @parent.set_object_id(@parent_oid)
diff --git a/qpid/cpp/bindings/qmf/tests/ruby_console.rb b/qpid/cpp/bindings/qmf/tests/ruby_console.rb
index c071829f09..2f8f633d16 100755
--- a/qpid/cpp/bindings/qmf/tests/ruby_console.rb
+++ b/qpid/cpp/bindings/qmf/tests/ruby_console.rb
@@ -96,9 +96,24 @@ class App < Qmf::ConsoleHandler
       puts "---- Brokers ----"
       blist.each do |b|
         puts "    ---- Broker ----"
-        puts "    systemRef: #{b.get_attr('systemRef')}"
-        puts "    port     : #{b.get_attr('port')}"
-        puts "    uptime   : #{b.get_attr('uptime') / 1000000000}"
+        puts "    systemRef: #{b.systemRef}"
+        puts "    port     : #{b.port}"
+        puts "    uptime   : #{b.uptime / 1000000000}"
+
+        for rep in 0...0
+          puts "    Pinging..."
+          ret = b.echo(45, 'text string')
+          puts "        ret=#{ret}"
+        end
+      end
+      puts "----"
+
+      qlist = @qmfc.get_objects(Qmf::Query.new(:package => "org.apache.qpid.broker",
+                                               :class => "queue"))
+      puts "---- Queues ----"
+      qlist.each do |q|
+        puts "    ---- Queue ----"
+        puts "    name     : #{q.name}"
       end
       puts "----"
       sleep(5)