projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch/update schema juju 2.3 alpha1 (#142)
[osm/N2VC.git]
/
juju
/
placement.py
diff --git
a/juju/placement.py
b/juju/placement.py
index
5ee9ba6
..
d0d42f7
100644
(file)
--- a/
juju/placement.py
+++ b/
juju/placement.py
@@
-22,7
+22,13
@@
def parse(directive):
# Handle null case
return None
# Handle null case
return None
- if type(directive) in [dict, client.Placement]:
+ if isinstance(directive, (list, tuple)):
+ results = []
+ for d in directive:
+ results.extend(parse(d))
+ return results
+
+ if isinstance(directive, (dict, client.Placement)):
# We've been handed something that we can simply hand back to
# the api. (Forwards compatibility)
return [directive]
# We've been handed something that we can simply hand back to
# the api. (Forwards compatibility)
return [directive]