import asyncio
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__)
"""
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.
self.connection = None
async def add_model(
- self, name, cloud, credential, owner=None,
- config=None, region=None):
+ self, model_name, cloud_name=None, credential_name=None,
+ owner=None, config=None, region=None):
"""Add a model to this controller.
- :param str name: Name of the model
- :param dict config: Model configuration
- :param str credential: e.g. '<cloud>:<credential>'
- :param str owner: Owner username
+ :param str model_name: Name to give the new model.
+ :param str cloud_name: Name of the cloud in which to create the
+ model, e.g. 'aws'. Defaults to same cloud as controller.
+ :param str credential_name: Name of the credential to use when
+ creating the model. Defaults to current credential. If you
+ pass a credential_name, you must also pass a cloud_name,
+ even if it's the default cloud.
+ :param str owner: Username that will own the model. Defaults to
+ the current user.
+ :param dict config: Model configuration.
+ :param str region: Region in which to create the model.
"""
model_facade = client.ModelManagerFacade()
model_facade.connect(self.connection)
- log.debug('Creating model %s', name)
+ owner = owner or self.connection.info['user-info']['identity']
+ cloud_name = cloud_name or await self.get_cloud()
+
+ if credential_name:
+ credential = tag.credential(
+ cloud_name,
+ tag.untag('user-', owner),
+ credential_name
+ )
+ else:
+ credential = None
+
+ log.debug('Creating model %s', model_name)
model_info = await model_facade.CreateModel(
- cloud,
+ tag.cloud(cloud_name),
config,
credential,
- name,
- owner or self.connection.info['user-info']['identity'],
+ model_name,
+ owner,
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)
+
+ 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 "
+ "to ssh into machines in this model. "
+ "Manually running `juju add-ssh-key <key>` in the cli "
+ "may fix this problem.")
+
model = Model()
await model.connect(
self.connection.endpoint,
self.connection.password,
self.connection.cacert,
self.connection.macaroons,
+ loop=self.loop,
)
return model
- async def destroy_models(self, *args):
-
- """Destroy a model to this controller.
-
- :param str : <UUID> of the Model
- param accepts string of <UUID> only OR `model-<UUID>`
+ async def destroy_models(self, *uuids):
+ """Destroy one or more models.
+ :param str \*uuids: UUIDs of models to destroy
"""
model_facade = client.ModelManagerFacade()
model_facade.connect(self.connection)
- # Generate list of args, pre-pend 'model-'
- prependarg = list(args)
- for index, item in enumerate(prependarg):
- if not item.startswith('model-'):
- prependarg[index] = "model-%s" % item
-
- # Create list of objects to pass to DestroyModels()
- arglist = []
- for arg in prependarg:
- arglist.append(client.Entity(arg))
- log.debug('Destroying Model %s', arg)
+ log.debug(
+ 'Destroying model%s %s',
+ '' if len(uuids) == 1 else 's',
+ ', '.join(uuids)
+ )
- await model_facade.DestroyModels(arglist)
+ await model_facade.DestroyModels([
+ client.Entity(tag.model(uuid))
+ for uuid in uuids
+ ])
+ destroy_model = destroy_models
def add_user(self, username, display_name=None, acl=None, models=None):
"""Add a user to this controller.
: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.
:param str password: New password
"""
- pass
+ raise NotImplementedError()
def destroy(self, destroy_all_models=False):
"""Destroy this controller.
controller.
"""
- pass
+ raise NotImplementedError()
def disable_user(self, username):
"""Disable a user.
:param str username: Username
"""
- pass
+ raise NotImplementedError()
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.
"""
- pass
+ raise NotImplementedError()
+
+ async def get_cloud(self):
+ """
+ Get the name of the cloud that this controller lives on.
+ """
+ cloud_facade = client.CloudFacade()
+ cloud_facade.connect(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):
"""Return list of available models on this controller.
: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.
- payload status
"""
- pass
+ raise NotImplementedError()
def get_users(self, all_=False):
"""Return list of users that can connect to this controller.
:param bool all_: Include disabled users
"""
- pass
+ raise NotImplementedError()
def login(self):
"""Log in to this controller.
"""
- pass
+ raise NotImplementedError()
def logout(self, force=False):
"""Log out of this controller.
with a password
"""
- pass
+ raise NotImplementedError()
def get_model(self, name):
"""Get a model by name.
:param str name: Model name
"""
- pass
+ raise NotImplementedError()
def get_user(self, username):
"""Get a user by name.
:param str username: Username
"""
- pass
+ raise NotImplementedError()
projects / osm / N2VC.git / blobdiff