add support for QMF TYPE_LIST in engine, ruby and python wrappers

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

6 files changed, 94 insertions, 10 deletions

diff --git a/qpid/cpp/bindings/qmf/python/qmf.py b/qpid/cpp/bindings/qmf/python/qmf.py
index e4ab581dfd..5dc1330cdb 100644
--- a/qpid/cpp/bindings/qmf/python/qmf.py
+++ b/qpid/cpp/bindings/qmf/python/qmf.py
@@ -58,10 +58,9 @@ def qmf_to_native(val):
     elif typecode == TYPE_INT32:  return val.asInt()
     elif typecode == TYPE_INT64:  return val.asInt64()
     elif typecode == TYPE_MAP: return value_to_dict(val)
+    elif typecode == TYPE_LIST: return value_to_list(val)
     else:
         # when TYPE_OBJECT
-        # when TYPE_LIST
-        # when TYPE_ARRAY
         logging.error( "Unsupported type for get_attr? '%s'" % str(val.getType()) )
         return None
 
@@ -98,11 +97,9 @@ def native_to_qmf(target, value):
     elif typecode == TYPE_INT32: val.setInt(value)
     elif typecode == TYPE_INT64: val.setInt64(value)
     elif typecode == TYPE_MAP: dict_to_value(val, value)
+    elif typecode == TYPE_LIST: list_to_value(val, value)
     else:
-        # when TYPE_MAP
         # when TYPE_OBJECT
-        # when TYPE_LIST
-        # when TYPE_ARRAY
         logging.error("Unsupported type for get_attr? '%s'" % str(val.getType()))
         return None
     return val
@@ -129,6 +126,7 @@ def pick_qmf_type(value):
     if value.__class__ == bool:  return TYPE_BOOL
     if value == None:            return TYPE_BOOL
     if value.__class__ == dict:  return TYPE_MAP
+    if value.__class__ == list:  return TYPE_LIST
 
     raise "QMF type not known for native type %s" % value.__class__
 
@@ -140,7 +138,7 @@ def value_to_dict(val):
         key = val.key(i)
         mymap[key] = qmf_to_native(val.byKey(key))
     return mymap
-    
+
 
 def dict_to_value(val, mymap):
     for key, value in mymap.items():
@@ -149,6 +147,26 @@ def dict_to_value(val, mymap):
         val.insert(key, native_to_qmf(typecode, value))
 
 
+def value_to_list(val):
+    mylist = []
+    if val.isList():
+        for i in range(val.listItemCount()):
+            mylist.append(qmf_to_native(val.listItem(i)))
+        return mylist
+    #if val.isArray():
+    #    for i in range(val.arrayItemCount()):
+    #        mylist.append(qmf_to_native(val.arrayItem(i)))
+    #    return mylist
+
+    raise "value_to_list must be given a list value"
+
+
+def list_to_value(val, mylist):
+    for item in mylist:
+        typecode = pick_qmf_type(item)
+        val.appendToList(native_to_qmf(typecode, item))
+
+
   ##==============================================================================
   ## CONNECTION
   ##==============================================================================
diff --git a/qpid/cpp/bindings/qmf/ruby/qmf.rb b/qpid/cpp/bindings/qmf/ruby/qmf.rb
index ce824b3605..823cf9bf93 100644
--- a/qpid/cpp/bindings/qmf/ruby/qmf.rb
+++ b/qpid/cpp/bindings/qmf/ruby/qmf.rb
@@ -48,8 +48,8 @@ module Qmf
       when TYPE_INT8, TYPE_INT16, TYPE_INT32    then val.asInt
       when TYPE_INT64                           then val.asInt64
       when TYPE_MAP                             then value_to_dict(val)
+      when TYPE_LIST                            then value_to_list(val)
       when TYPE_OBJECT
-      when TYPE_LIST
       when TYPE_ARRAY
       end
     end
@@ -77,8 +77,8 @@ module Qmf
       when TYPE_INT8, TYPE_INT16, TYPE_INT32 then val.setInt(value)
       when TYPE_INT64 then val.setInt64(value)
       when TYPE_MAP then dict_to_value(val, value)
+      when TYPE_LIST then list_to_value(val, value)
       when TYPE_OBJECT
-      when TYPE_LIST
       when TYPE_ARRAY
       end
       return val
@@ -112,6 +112,7 @@ module Qmf
       return TYPE_BOOL if value.class == NilClass
 
       return TYPE_MAP if value.class == Hash
+      return TYPE_LIST if value.class == Array
 
       raise ArgumentError, "QMF type not known for native type #{value.class}"
     end
@@ -134,6 +135,23 @@ module Qmf
         val.insert(key, native_to_qmf(typecode, value))
       end
     end
+
+    def value_to_list(val)
+      # Assume val is of type Qmfengine::Value
+      raise ArgumentError, "value_to_dict must be given a map value" if !val.isList
+      list = []
+      for i in 0...val.listItemCount
+        list.push(qmf_to_native(val.listItem(i)))
+      end
+      return list
+    end
+
+    def list_to_value(val, list)
+      list.each do |value|
+        typecode = pick_qmf_type(value)
+        val.appendToList(native_to_qmf(typecode, value))
+      end
+    end
   end
 
   $util = Util.new
diff --git a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
index 86eefc59a6..92065031a2 100755
--- a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
+++ b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
@@ -44,6 +44,7 @@ class Model
     @parent_class.add_property(Qmf::SchemaProperty.new("lstrval", Qmf::TYPE_LSTR))
 
     @parent_class.add_property(Qmf::SchemaProperty.new("mapval", Qmf::TYPE_MAP))
+    @parent_class.add_property(Qmf::SchemaProperty.new("listval", Qmf::TYPE_LIST))
 
     @parent_class.add_statistic(Qmf::SchemaStatistic.new("queryCount", Qmf::TYPE_UINT32, :unit => "query", :desc => "Query count"))
 
@@ -246,6 +247,11 @@ class App < Qmf::AgentHandler
     @parent.int16val = 0
     @parent.int8val  = 0
 
+    # a list containing a list that contains a map (so there!)
+    @parent.listval = ['a', 1, 'b', 2,
+                       ['c', true, 3.1415,
+                        {"hi" => 10, "lo" => 5}]]
+
     @parent_oid = @agent.alloc_object_id(1)
     @parent.set_object_id(@parent_oid)
 
diff --git a/qpid/cpp/bindings/qmf/tests/python_agent.py b/qpid/cpp/bindings/qmf/tests/python_agent.py
index 83531830b1..4974e0ec90 100644
--- a/qpid/cpp/bindings/qmf/tests/python_agent.py
+++ b/qpid/cpp/bindings/qmf/tests/python_agent.py
@@ -45,6 +45,7 @@ class Model:
         self.parent_class.add_property(qmf.SchemaProperty("lstrval", qmf.TYPE_LSTR))
 
         self.parent_class.add_property(qmf.SchemaProperty("mapval", qmf.TYPE_MAP))
+        self.parent_class.add_property(qmf.SchemaProperty("listval", qmf.TYPE_LIST))
 
 
         self.parent_class.add_statistic(qmf.SchemaStatistic("queryCount", qmf.TYPE_UINT32, {"unit":"query", "desc":"Query count"}))
@@ -274,7 +275,7 @@ class App(qmf.AgentHandler):
 
         ## @todo how do we force a test failure?
         # verify the properties() and statistics() object methods:
-        assert len(self._parent.properties()) == 13
+        assert len(self._parent.properties()) == 14
         assert len(self._parent.statistics()) == 1
 
         self._parent.set_attr("name", "Parent One")
@@ -290,6 +291,11 @@ class App(qmf.AgentHandler):
         self._parent.set_attr("int16val", 0)
         self._parent.set_attr("int8val",  0)
 
+        # a list containing a list that contains a map (so there!)
+        self._parent.set_attr("listval", ['a', 1, 'b', 2,
+                                          ['c', True, 3.1415,
+                                           {"hi": 10, "lo": 5}]])
+
         self._parent_oid = self._agent.alloc_object_id(1)
         self._parent.set_object_id(self._parent_oid)
 
diff --git a/qpid/cpp/bindings/qmf/tests/python_console.py b/qpid/cpp/bindings/qmf/tests/python_console.py
index fe27c33c4b..efd25a1d26 100755
--- a/qpid/cpp/bindings/qmf/tests/python_console.py
+++ b/qpid/cpp/bindings/qmf/tests/python_console.py
@@ -202,7 +202,26 @@ class QmfInteropTests(TestBase010):
         self.assertEqual(queue[3].arguments["strval"], "TEST")
         self.assertEqual(queue[4].arguments["uint32val"], 0)
         self.assertEqual(queue[4].arguments["strval"], "LONG_TEST")
-        
+
+
+    def test_G_basic_map_list_data(self):
+        self.startQmf();
+        qmf = self.qmf
+
+        parents = qmf.getObjects(_class="parent")
+        self.assertEqual(len(parents), 1)
+        parent = parents[0]
+
+        # see agent for structure of listval
+
+        self.assertTrue(isinstance(parent.listval, list))
+        self.assertEqual(len(parent.listval), 5)
+        self.assertTrue(isinstance(parent.listval[4], list))
+        self.assertEqual(len(parent.listval[4]), 4)
+        self.assertTrue(isinstance(parent.listval[4][3], dict))
+        self.assertEqual(parent.listval[4][3]["hi"], 10)
+        self.assertEqual(parent.listval[4][3]["lo"], 5)
+
 
     def getProperty(self, msg, name):
         for h in msg.headers:
diff --git a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
index 3a771aaafd..9ef0ef57a8 100755
--- a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
+++ b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
@@ -266,6 +266,23 @@ class ConsoleTest < ConsoleTestBase
     end
   end
 
+
+
+  def test_G_basic_map_list_data
+    parent = @qmfc.object(:class => "parent")
+    assert(parent, "Number of 'parent' objects")
+
+    # see agent for structure of listval
+
+    assert(parent.listval.class == Array)
+    assert_equal(parent.listval.length, 5)
+    assert(parent.listval[4].class == Array)
+    assert_equal(parent.listval[4].length, 4)
+    assert(parent.listval[4][3].class == Hash)
+    assert_equal(parent.listval[4][3]["hi"], 10)
+    assert_equal(parent.listval[4][3]["lo"], 5)
+  end
+
 end
 
 app = ConsoleTest.new