Merge ~aasbin.chhetri/juju-autoreg:testing into ~peter-sabaini/juju-autoreg:master

[aasbin]

Added a get_user call within enable_user and disable_user.

added a get_user call in enable _user and disable_user method
to return the a juju user object of disabled and enabled users

[Andrea Ieri (aieri)]

comments inline, but also: since 9c3f1b7 has been completely superseded, please squash it into 0072a63

review: Needs Fixing

625d522... by aasbin on 2019-02-14

Added a get_user call within enable_user and disable_user

   - added a get_user call in enable _user and disable_user method
   - removed [] in logging infor to avoid string format error

[Andrea Ieri (aieri)]

Very minor: you have typo in your commit message, 'enable _user' → 'enable_user'
Otherwise lgtm.

review: Approve

Unmerged commits

625d522... by aasbin on 2019-02-14

Added a get_user call within enable_user and disable_user

   - added a get_user call in enable _user and disable_user method
   - removed [] in logging infor to avoid string format error

diff --git a/autoreg/cli_sync_users.py b/autoreg/cli_sync_users.py
index ea8e54e..6d87813 100644
--- a/autoreg/cli_sync_users.py
+++ b/autoreg/cli_sync_users.py
@@ -37,7 +37,7 @@ def get_group_users(group_names):
               help="Model permissions new users should get")
 def sync_users(groups, targetdir, controller_access, model_access):
     group_users = get_group_users(groups.split(','))
-    logging.info("Groups %s contain %r users", [groups, len(group_users)])
+    logging.info("Groups %s contain %r users", groups, len(group_users))
     with JujuUsers() as juju_users:
         logging.info("Connected to juju controller")
         added, enabled, disabled = juju_users.ensure_users(group_users,
diff --git a/autoreg/jujureg.py b/autoreg/jujureg.py
index e0ba739..f916c17 100644
--- a/autoreg/jujureg.py
+++ b/autoreg/jujureg.py
@@ -81,9 +81,9 @@ class JujuUsers:
         :param name: user name
         :return: Enabled user (juju.user.User object)
         """
-        res = await self._controller.enable_user(name)
+        await self._controller.enable_user(name)
         logging.info("Enabled user %s", name)
-        return res
+        return await self._controller.get_user(name)
 
     @sync_wrapper
     async def disable_user(self, name):
@@ -91,9 +91,9 @@ class JujuUsers:
         :param name: user name
         :return: None
         """
-        res = await self._controller.disable_user(name)
+        await self._controller.disable_user(name)
         logging.info("Disabled user %s", name)
-        return res
+        return await self._controller.get_user(name)
 
     @sync_wrapper
     async def get_users(self, include_disabled=False):