Skip to content

Fix ListModel conversion to primitive #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bradmwilliams merged 1 commit into from
Jul 18, 2020
Merged

Fix ListModel conversion to primitive #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/rebuild_module.digest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5eb4a318eecb23a689b2ce1239f9f2d9 -
a06864db406247ccbde152f8585ef916 -
2 changes: 1 addition & 1 deletion ansible/roles/openshift_client_python/library/openshift_client_python.py
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/openshift/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
34 changes: 34 additions & 0 deletions packages/openshift/test_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down