X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fcontroller.py;h=9b452c7c88b0fa3c086d3263217da3973dc08674;hb=fbd25b458d70f0ca0743be60ff3d6ab21335707f;hp=135027a597273416afd7006663875ff360a3a333;hpb=088c31421225483fffffe91ef71fcbcb3d2d98ac;p=osm%2FN2VC.git diff --git a/juju/controller.py b/juju/controller.py index 135027a..9b452c7 100644 --- a/juju/controller.py +++ b/juju/controller.py @@ -11,7 +11,8 @@ log = logging.getLogger(__name__) class Controller(object): - def __init__(self, loop=None): + def __init__(self, loop=None, + max_frame_size=connection.Connection.DEFAULT_FRAME_SIZE): """Instantiate a new Controller. One of the connect_* methods will need to be called before this @@ -21,6 +22,7 @@ class Controller(object): """ self.loop = loop or asyncio.get_event_loop() + self.max_frame_size = None self.connection = None self.controller_name = None @@ -30,21 +32,24 @@ class Controller(object): """ self.connection = await connection.Connection.connect( - endpoint, None, username, password, cacert, macaroons) + endpoint, None, username, password, cacert, macaroons, + max_frame_size=self.max_frame_size) async def connect_current(self): """Connect to the current Juju controller. """ self.connection = ( - await connection.Connection.connect_current_controller()) + await connection.Connection.connect_current_controller( + max_frame_size=self.max_frame_size)) async def connect_controller(self, controller_name): """Connect to a Juju controller by name. """ self.connection = ( - await connection.Connection.connect_controller(controller_name)) + await connection.Connection.connect_controller( + controller_name, max_frame_size=self.max_frame_size)) self.controller_name = controller_name async def disconnect(self): @@ -74,8 +79,8 @@ class Controller(object): :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() @@ -97,7 +102,7 @@ class Controller(object): credential, model_name, owner, - region, + region ) # Add our ssh key to the model, to work around @@ -137,8 +142,8 @@ class Controller(object): :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', @@ -152,7 +157,7 @@ class Controller(object): ]) 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 @@ -161,39 +166,53 @@ class Controller(object): :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 @@ -206,14 +225,13 @@ class Controller(object): """ 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 @@ -221,7 +239,9 @@ class Controller(object): :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. @@ -272,10 +292,40 @@ class Controller(object): """ 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])