projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make connect_model and deploy a bit more friendly
[osm/N2VC.git]
/
juju
/
controller.py
diff --git
a/juju/controller.py
b/juju/controller.py
index
d64a2f7
..
b3d2ac1
100644
(file)
--- a/
juju/controller.py
+++ b/
juju/controller.py
@@
-1,12
+1,10
@@
import asyncio
import asyncio
-import concurrent.futures
import logging
from . import tag
from . import utils
from .client import client
from .client import connection
import logging
from . import tag
from . import utils
from .client import client
from .client import connection
-from .client import watcher
from .model import Model
log = logging.getLogger(__name__)
from .model import Model
log = logging.getLogger(__name__)
@@
-103,13
+101,11
@@
class Controller(object):
# Add our ssh key to the model, to work around
# https://bugs.launchpad.net/juju/+bug/1643076
try:
# Add our ssh key to the model, to work around
# https://bugs.launchpad.net/juju/+bug/1643076
try:
- ssh_key = await self.loop.run_in_executor(
- concurrent.futures.ThreadPoolExecutor(),
- utils.read_ssh_key
- )
+ ssh_key = await utils.read_ssh_key(loop=self.loop)
await utils.execute_process(
await utils.execute_process(
- 'juju', 'add-ssh-key', '-m', model_name, ssh_key, log=log)
- except Exception as e:
+ 'juju', 'add-ssh-key', '-m', model_name, ssh_key, log=log,
+ loop=self.loop)
+ except Exception:
log.exception(
"Could not add ssh key to model. You will not be able "
"to ssh into machines in this model. "
log.exception(
"Could not add ssh key to model. You will not be able "
"to ssh into machines in this model. "
@@
-124,6
+120,7
@@
class Controller(object):
self.connection.password,
self.connection.cacert,
self.connection.macaroons,
self.connection.password,
self.connection.cacert,
self.connection.macaroons,
+ loop=self.loop,
)
return model
)
return model
@@
-158,7
+155,7
@@
class Controller(object):
:param list models: Models to which the user is granted access
"""
:param list models: Models to which the user is granted access
"""
- pass
+ raise NotImplementedError()
def change_user_password(self, username, password):
"""Change the password for a user in this controller.
def change_user_password(self, username, password):
"""Change the password for a user in this controller.
@@
-167,7
+164,7
@@
class Controller(object):
:param str password: New password
"""
:param str password: New password
"""
- pass
+ raise NotImplementedError()
def destroy(self, destroy_all_models=False):
"""Destroy this controller.
def destroy(self, destroy_all_models=False):
"""Destroy this controller.
@@
-176,7
+173,7
@@
class Controller(object):
controller.
"""
controller.
"""
- pass
+ raise NotImplementedError()
def disable_user(self, username):
"""Disable a user.
def disable_user(self, username):
"""Disable a user.
@@
-184,20
+181,20
@@
class Controller(object):
:param str username: Username
"""
:param str username: Username
"""
- pass
+ raise NotImplementedError()
def enable_user(self):
"""Re-enable a previously disabled user.
"""
def enable_user(self):
"""Re-enable a previously disabled user.
"""
- pass
+ raise NotImplementedError()
def kill(self):
"""Forcibly terminate all machines and other associated resources for
this controller.
"""
def kill(self):
"""Forcibly terminate all machines and other associated resources for
this controller.
"""
- pass
+ raise NotImplementedError()
async def get_cloud(self):
"""
async def get_cloud(self):
"""
@@
-218,7
+215,7
@@
class Controller(object):
:param str username: User for which to list models (admin use only)
"""
:param str username: User for which to list models (admin use only)
"""
- pass
+ raise NotImplementedError()
def get_payloads(self, *patterns):
"""Return list of known payloads.
def get_payloads(self, *patterns):
"""Return list of known payloads.
@@
-236,7
+233,7
@@
class Controller(object):
- payload status
"""
- payload status
"""
- pass
+ raise NotImplementedError()
def get_users(self, all_=False):
"""Return list of users that can connect to this controller.
def get_users(self, all_=False):
"""Return list of users that can connect to this controller.
@@
-244,13
+241,13
@@
class Controller(object):
:param bool all_: Include disabled users
"""
:param bool all_: Include disabled users
"""
- pass
+ raise NotImplementedError()
def login(self):
"""Log in to this controller.
"""
def login(self):
"""Log in to this controller.
"""
- pass
+ raise NotImplementedError()
def logout(self, force=False):
"""Log out of this controller.
def logout(self, force=False):
"""Log out of this controller.
@@
-259,7
+256,7
@@
class Controller(object):
with a password
"""
with a password
"""
- pass
+ raise NotImplementedError()
def get_model(self, name):
"""Get a model by name.
def get_model(self, name):
"""Get a model by name.
@@
-267,7
+264,7
@@
class Controller(object):
:param str name: Model name
"""
:param str name: Model name
"""
- pass
+ raise NotImplementedError()
def get_user(self, username):
"""Get a user by name.
def get_user(self, username):
"""Get a user by name.
@@
-275,4
+272,4
@@
class Controller(object):
:param str username: Username
"""
:param str username: Username
"""
- pass
+ raise NotImplementedError()