"""
self.loop = loop or asyncio.get_event_loop()
self.connection = None
+ self.controller_name = None
async def connect(
self, endpoint, username, password, cacert=None, macaroons=None):
"""
self.connection = (
await connection.Connection.connect_controller(controller_name))
+ self.controller_name = controller_name
async def disconnect(self):
"""Shut down the watcher task and close websockets.
:param str region: Region in which to create the model.
"""
- model_facade = client.ModelManagerFacade()
- model_facade.connect(self.connection)
+ model_facade = client.ModelManagerFacade.from_connection(
+ self.connection)
owner = owner or self.connection.info['user-info']['identity']
cloud_name = cloud_name or await self.get_cloud()
credential,
model_name,
owner,
- region,
+ region
)
# Add our ssh key to the model, to work around
# https://bugs.launchpad.net/juju/+bug/1643076
try:
ssh_key = await utils.read_ssh_key(loop=self.loop)
- await utils.execute_process(
- 'juju', 'add-ssh-key', '-m', model_name, ssh_key, log=log,
- loop=self.loop)
+
+ if self.controller_name:
+ model_name = "{}:{}".format(self.controller_name, model_name)
+
+ cmd = ['juju', 'add-ssh-key', '-m', model_name, ssh_key]
+
+ await utils.execute_process(*cmd, log=log, loop=self.loop)
except Exception:
log.exception(
"Could not add ssh key to model. You will not be able "
:param str \*uuids: UUIDs of models to destroy
"""
- model_facade = client.ModelManagerFacade()
- model_facade.connect(self.connection)
+ model_facade = client.ModelManagerFacade.from_connection(
+ self.connection)
log.debug(
'Destroying model%s %s',
])
destroy_model = destroy_models
- def add_user(self, username, display_name=None, acl=None, models=None):
+ async def add_user(self, username, password=None, display_name=None):
"""Add a user to this controller.
:param str username: Username
:param list models: Models to which the user is granted access
"""
- raise NotImplementedError()
-
- def change_user_password(self, username, password):
+ if not display_name:
+ display_name = username
+ user_facade = client.UserManagerFacade.from_connection(self.connection)
+ users = [{'display_name': display_name,
+ 'password': password,
+ 'username': username}]
+ return await user_facade.AddUser(users)
+
+ async def change_user_password(self, username, password):
"""Change the password for a user in this controller.
:param str username: Username
:param str password: New password
"""
- raise NotImplementedError()
+ user_facade = client.UserManagerFacade.from_connection(self.connection)
+ entity = client.EntityPassword(password, tag.user(username))
+ return await user_facade.SetPassword([entity])
- def destroy(self, destroy_all_models=False):
+ async def destroy(self, destroy_all_models=False):
"""Destroy this controller.
:param bool destroy_all_models: Destroy all hosted models in the
controller.
"""
- raise NotImplementedError()
+ controller_facade = client.ControllerFacade.from_connection(
+ self.connection)
+ return await controller_facade.DestroyController(destroy_all_models)
- def disable_user(self, username):
+ async def disable_user(self, username):
"""Disable a user.
:param str username: Username
"""
- raise NotImplementedError()
+ user_facade = client.UserManagerFacade.from_connection(self.connection)
+ entity = client.Entity(tag.user(username))
+ return await user_facade.DisableUser([entity])
- def enable_user(self):
+ async def enable_user(self, username):
"""Re-enable a previously disabled user.
"""
- raise NotImplementedError()
+ user_facade = client.UserManagerFacade.from_connection(self.connection)
+ entity = client.Entity(tag.user(username))
+ return await user_facade.EnableUser([entity])
def kill(self):
"""Forcibly terminate all machines and other associated resources for
"""
Get the name of the cloud that this controller lives on.
"""
- cloud_facade = client.CloudFacade()
- cloud_facade.connect(self.connection)
+ cloud_facade = client.CloudFacade.from_connection(self.connection)
result = await cloud_facade.Clouds()
cloud = list(result.clouds.keys())[0] # only lives on one cloud
return tag.untag('cloud-', cloud)
- def get_models(self, all_=False, username=None):
+ async def get_models(self, all_=False, username=None):
"""Return list of available models on this controller.
:param bool all_: List all models, regardless of user accessibilty
:param str username: User for which to list models (admin use only)
"""
- raise NotImplementedError()
+ controller_facade = client.ControllerFacade.from_connection(
+ self.connection)
+ return await controller_facade.AllModels()
+
def get_payloads(self, *patterns):
"""Return list of known payloads.
"""
raise NotImplementedError()
- def get_user(self, username):
+ async def get_user(self, username, include_disabled=False):
"""Get a user by name.
:param str username: Username
"""
- raise NotImplementedError()
+ client_facade = client.UserManagerFacade.from_connection(
+ self.connection)
+ user = tag.user(username)
+ return await client_facade.UserInfo([client.Entity(user)], include_disabled)
+
+ async def grant(self, username, acl='login'):
+ """Set access level of the given user on the controller
+
+ :param str username: Username
+ :param str acl: Access control ('login', 'add-model' or 'superuser')
+
+ """
+ controller_facade = client.ControllerFacade.from_connection(
+ self.connection)
+ user = tag.user(username)
+ await self.revoke(username)
+ changes = client.ModifyControllerAccess(acl, 'grant', user)
+ return await controller_facade.ModifyControllerAccess([changes])
+
+ async def revoke(self, username):
+ """Removes all access from a controller
+
+ :param str username: username
+
+ """
+ controller_facade = client.ControllerFacade.from_connection(
+ self.connection)
+ user = tag.user(username)
+ changes = client.ModifyControllerAccess('login', 'revoke', user)
+ return await controller_facade.ModifyControllerAccess([changes])
projects / osm / N2VC.git / blobdiff