projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add get_config() and get_constraints() for Application
[osm/N2VC.git]
/
juju
/
model.py
diff --git
a/juju/model.py
b/juju/model.py
index
cc9ee95
..
52721a7
100644
(file)
--- a/
juju/model.py
+++ b/
juju/model.py
@@
-759,9
+759,6
@@
class Model(object):
- series is required; how do we pick a default?
"""
- series is required; how do we pick a default?
"""
- if constraints:
- constraints = client.Value(**constraints)
-
if to:
placement = [
client.Placement(**p) for p in to
if to:
placement = [
client.Placement(**p) for p in to
@@
-791,8
+788,11
@@
class Model(object):
if pending_apps:
# new apps will usually be in the model by now, but if some
# haven't made it yet we'll need to wait on them to be added
if pending_apps:
# new apps will usually be in the model by now, but if some
# haven't made it yet we'll need to wait on them to be added
- await asyncio.wait([self._wait_for_new('application', app_name)
- for app_name in pending_apps])
+ await asyncio.gather(*[
+ asyncio.ensure_future(
+ self.model._wait_for_new('application', app_name))
+ for app_name in pending_apps
+ ])
return [app for name, app in self.applications.items()
if name in handler.applications]
else:
return [app for name, app in self.applications.items()
if name in handler.applications]
else:
@@
-815,7
+815,7
@@
class Model(object):
)
await app_facade.Deploy([app])
)
await app_facade.Deploy([app])
- return
[await self._wait_for_new('application', service_name)]
+ return
await self._wait_for_new('application', service_name)
def destroy(self):
"""Terminate all machines and resources for this model.
def destroy(self):
"""Terminate all machines and resources for this model.