git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
[plstackapi.git]
/
planetstack
/
dmdot
diff --git
a/planetstack/dmdot
b/planetstack/dmdot
old mode 100755
(executable)
new mode 100644
(file)
index
4353793
..
9e13df2
--- a/
planetstack/dmdot
+++ b/
planetstack/dmdot
@@
-28,6
+28,8
@@
app = app + ".models"
#models_module = imp.load_source(app, ".")
models_module = __import__(app)
for part in app.split(".")[1:]:
#models_module = imp.load_source(app, ".")
models_module = __import__(app)
for part in app.split(".")[1:]:
+ if hasattr(models_module, "PlCoreBase"):
+ break
models_module = getattr(models_module,part)
PlCoreBase = getattr(models_module,"PlCoreBase")
models_module = getattr(models_module,part)
PlCoreBase = getattr(models_module,"PlCoreBase")
@@
-65,6
+67,7
@@
elif (output=='-json'):
d[c.__name__].append(linked_class.__name__)
except KeyError:
d[c.__name__]=[linked_class.__name__]
d[c.__name__].append(linked_class.__name__)
except KeyError:
d[c.__name__]=[linked_class.__name__]
+ d['NetworkDeployments'].append('SliceDeployments')
print json.dumps(d,indent=4)
print json.dumps(d,indent=4)