X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fcontroller.py;h=b3d2ac103af104b07f35de9bb8b01d6ab44c4f07;hb=27dfe759bbb54ca7dc963c30f6c52406c456983a;hp=67409ba879c628de63c39be2a53707b07a9f1fb6;hpb=6ba2856fecf224ae3fd589331e889a6587e8153b;p=osm%2FN2VC.git diff --git a/juju/controller.py b/juju/controller.py index 67409ba..b3d2ac1 100644 --- a/juju/controller.py +++ b/juju/controller.py @@ -2,9 +2,9 @@ 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__) @@ -55,44 +55,63 @@ class Controller(object): self.connection = None async def add_model( - self, model_name, cloud_name, credential_name, + self, model_name, cloud_name=None, credential_name=None, owner=None, config=None, region=None): """Add a model to this controller. :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'. + model, e.g. 'aws'. Defaults to same cloud as controller. :param str credential_name: Name of the credential to use when - creating the model. + 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. """ - # XXX: We can probably obviate the cloud_name param by getting it - # from the controller itself. - model_facade = client.ModelManagerFacade() model_facade.connect(self.connection) 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( tag.cloud(cloud_name), config, - tag.credential( - cloud_name, - tag.untag('user-', owner), - credential_name - ), + credential, 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) + await utils.execute_process( + '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. " + "Manually running `juju add-ssh-key ` in the cli " + "may fix this problem.") + model = Model() await model.connect( self.connection.endpoint, @@ -101,6 +120,7 @@ class Controller(object): self.connection.password, self.connection.cacert, self.connection.macaroons, + loop=self.loop, ) return model @@ -135,7 +155,7 @@ class Controller(object): :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. @@ -144,7 +164,7 @@ class Controller(object): :param str password: New password """ - pass + raise NotImplementedError() def destroy(self, destroy_all_models=False): """Destroy this controller. @@ -153,7 +173,7 @@ class Controller(object): controller. """ - pass + raise NotImplementedError() def disable_user(self, username): """Disable a user. @@ -161,20 +181,31 @@ class Controller(object): :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. @@ -184,7 +215,7 @@ class Controller(object): :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. @@ -202,7 +233,7 @@ class Controller(object): - payload status """ - pass + raise NotImplementedError() def get_users(self, all_=False): """Return list of users that can connect to this controller. @@ -210,13 +241,13 @@ class Controller(object): :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. @@ -225,7 +256,7 @@ class Controller(object): with a password """ - pass + raise NotImplementedError() def get_model(self, name): """Get a model by name. @@ -233,7 +264,7 @@ class Controller(object): :param str name: Model name """ - pass + raise NotImplementedError() def get_user(self, username): """Get a user by name. @@ -241,4 +272,4 @@ class Controller(object): :param str username: Username """ - pass + raise NotImplementedError()