commit 1ab0865c1b9a8d17847d1a56d5815ef7c6f72352
author Jenkins <jenkins@review.openstack.org> Sun Jan 12 03:41:28 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sun Jan 12 03:41:28 2014 +0000
tree a236d3a488de5b69dc41ffd0de71c3422208117b
parent 91e05eca75f23ac41fd0d386e79155d6b070d8c3
parent 513c8393de336d459837abe014ebd43494d16c08

Merge "Fixes handling of arrays in XML to JSON conversion"

tempest/services/compute/xml/common.py

diff --git a/tempest/services/compute/xml/common.py b/tempest/services/compute/xml/common.py
index d2a18a1..76ad1aa 100644
--- a/tempest/services/compute/xml/common.py
+++ b/tempest/services/compute/xml/common.py
@@ -124,9 +124,9 @@
         if tag.startswith("{"):
             ns, tag = tag.split("}", 1)
         if plurals is not None and tag in plurals:
-                json[tag] = parse_array(child)
+                json[tag] = parse_array(child, plurals)
         else:
-            json[tag] = xml_to_json(child)
+            json[tag] = xml_to_json(child, plurals)
     return json