X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fcontroller.py;h=b3d2ac103af104b07f35de9bb8b01d6ab44c4f07;hb=07d8f84983e1b97bb01db7c82a8fdbaa90984161;hp=2d8b4faa7294e1e1926a9c52350b5f6ee47ad24e;hpb=f706324286abe99e13524f272fb792287d53ced4;p=osm%2FN2VC.git diff --git a/juju/controller.py b/juju/controller.py index 2d8b4fa..b3d2ac1 100644 --- a/juju/controller.py +++ b/juju/controller.py @@ -1,15 +1,36 @@ 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__) class Controller(object): + def __init__(self, loop=None): + """Instantiate a new Controller. + + One of the connect_* methods will need to be called before this + object can be used for anything interesting. + + :param loop: an asyncio event loop + + """ + self.loop = loop or asyncio.get_event_loop() + self.connection = None + + async def connect( + self, endpoint, username, password, cacert=None, macaroons=None): + """Connect to an arbitrary Juju controller. + + """ + self.connection = await connection.Connection.connect( + endpoint, None, username, password, cacert, macaroons) + async def connect_current(self): """Connect to the current Juju controller. @@ -17,6 +38,13 @@ class Controller(object): self.connection = ( await connection.Connection.connect_current_controller()) + async def connect_controller(self, controller_name): + """Connect to a Juju controller by name. + + """ + self.connection = ( + await connection.Connection.connect_controller(controller_name)) + async def disconnect(self): """Shut down the watcher task and close websockets. @@ -27,30 +55,63 @@ class Controller(object): 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. ':' - :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) + 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, @@ -59,23 +120,31 @@ class Controller(object): 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. + async def destroy_models(self, *uuids): + """Destroy one or more models. - :param str : model- + :param str \*uuids: UUIDs of models to destroy """ model_facade = client.ModelManagerFacade() model_facade.connect(self.connection) - for arg in args: - log.debug('Destroying Model %s', arg) - await model_facade.DestroyModels([client.Entity(arg)]) + log.debug( + 'Destroying model%s %s', + '' if len(uuids) == 1 else 's', + ', '.join(uuids) + ) + + 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. @@ -86,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. @@ -95,7 +164,7 @@ class Controller(object): :param str password: New password """ - pass + raise NotImplementedError() def destroy(self, destroy_all_models=False): """Destroy this controller. @@ -104,7 +173,7 @@ class Controller(object): controller. """ - pass + raise NotImplementedError() def disable_user(self, username): """Disable a user. @@ -112,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. @@ -135,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. @@ -153,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. @@ -161,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. @@ -176,7 +256,7 @@ class Controller(object): with a password """ - pass + raise NotImplementedError() def get_model(self, name): """Get a model by name. @@ -184,7 +264,7 @@ class Controller(object): :param str name: Model name """ - pass + raise NotImplementedError() def get_user(self, username): """Get a user by name. @@ -192,4 +272,4 @@ class Controller(object): :param str username: Username """ - pass + raise NotImplementedError()