Merge pull request #65 from jupierce/list_model

Fix ListModel conversion to primitive

Author: bradmwilliams

ansible/rebuild_module.digest

@@ -1 +1 @@
-5eb4a318eecb23a689b2ce1239f9f2d9  -
+a06864db406247ccbde152f8585ef916  -

ansible/roles/openshift_client_python/library/openshift_client_python.py

@@ -211,6 +211,8 @@ def _primitive(self):
         """
         l = []
         for e in self:
+            if isinstance(e, Model) or isinstance(e, ListModel):
+                e = e._primitive()
             l.append(e)
         return l
 

packages/openshift/model.py

@@ -23,6 +23,40 @@ def test_falsey(self):
         if len(miss) != 0:
             self.fail("Expected zero length")
 
+    def test_primitive(self):
+        d = {
+            "a": 1,
+            "b": 2,
+            "map1": {
+                "c": 3,
+                "d": 4
+            },
+            "list1": [
+                5,
+                6,
+                7,
+            ],
+            "list2": [
+                {
+                    "e": 5,
+                    "f": 6
+                },
+                {
+                    "g": 5,
+                    "h": 6
+                },
+            ],
+        }
+        m = Model(dict_to_model=d)
+        d2 = m._primitive()
+        if d2 != d:
+            self.fail('Primitive did not restore to expected state')
+
+        self.assertTrue(isinstance(m, Model))
+        self.assertFalse(isinstance(d2['map1'], Model))
+        self.assertFalse(isinstance(d2['list2'], ListModel))
+        self.assertFalse(isinstance(d2['list2'][0], Model))
+
     def test_access(self):
         m = Model()
         m.metadata = {