Merge lp:~andrewjbeach/juju-ci-tools/rm-list-shares into lp:juju-ci-tools

[Andrew James Beach]

Removed the use of juju list-shares in the test set-ups.

assess_user_grant_revoke.py was the only script that used it. The usage there
was replaced with show-model. Some minimal additions to fakejuju.FakeBackend
were made to accomidate the changes.

[Nicholas Skaggs (nskaggs)]

Please remove any list-shares code. The command is now dead and isn't needed to support previous betas.

[Nicholas Skaggs (nskaggs)]

review: Needs Fixing

[Andrew James Beach (andrewjbeach)]

Added explanation for an extra change I had made.

The add_model function would create a new FakeEnviormentState without a controller. So the new FakeEnviormentState would create a new FakeControllerState to be its controller. However add_model overwrites that new FakeControllerState with a reference to self a few lines later, so that self is the controller.

The change saves creating the discarded FakeControllerState and clarifies that the new FakeEnviormentState does indeed use the current FakeKontrollerState as its controller.

[lp:~andrewjbeach/juju-ci-tools/rm-list-shares]

1595. By Andrew James Beach on 2016-09-16

Removed refrence to the list-shares command.

[Nicholas Skaggs (nskaggs)]

Thank you.

review: Approve

=== modified file 'assess_user_grant_revoke.py'
--- assess_user_grant_revoke.py	2016-09-13 21:33:20 +0000
+++ assess_user_grant_revoke.py	2016-09-16 19:55:08 +0000
@@ -82,8 +82,9 @@
 
 def list_shares(client):
     """Test listing users' shares"""
-    share_list = json.loads(client.get_juju_output('list-shares', '--format',
+    model_data = json.loads(client.get_juju_output('show-model', '--format',
                                                    'json', include_e=False))
+    share_list = model_data['default']['users']
     for key, value in share_list.iteritems():
         value.pop("last-connection", None)
     return share_list

=== modified file 'fakejuju.py'
--- fakejuju.py	2016-09-13 18:16:55 +0000
+++ fakejuju.py	2016-09-16 19:55:08 +0000
@@ -59,10 +59,9 @@
         self.shares = ['admin']
 
     def add_model(self, name):
-        state = FakeEnvironmentState()
+        state = FakeEnvironmentState(self)
         state.name = name
         self.models[name] = state
-        state.controller = self
         state.controller.state = 'created'
         return state
 
@@ -506,7 +505,7 @@
             user_status = {'user-name': user_name, 'display-name': ''}
         return user_status
 
-    def list_shares(self):
+    def get_users(self):
         share_names = self.controller_state.shares
         permissions = []
         for key, value in self.controller_state.users.iteritems():
@@ -524,6 +523,19 @@
                 share_list[name]['access'] = 'admin'
         return share_list
 
+    def show_model(self):
+        # To get data from the model we would need:
+        # self.controller_state.current_model
+        model_name = 'default'
+        data = {
+            'name': model_name,
+            'owner': 'admin@local',
+            'life': 'alive',
+            'status': {'current': 'available', 'since': '15 minutes ago'},
+            'users': self.get_users(),
+            }
+        return { model_name: data }
+
     def _log_command(self, command, args, model, level=logging.INFO):
         full_args = ['juju', command]
         if model is not None:
@@ -674,8 +686,8 @@
             return yaml.safe_dump(self.list_models())
         if command == 'list-users':
             return json.dumps(self.list_users())
-        if command == 'list-shares':
-            return json.dumps(self.list_shares())
+        if command == 'show-model':
+            return json.dumps(self.show_model())
         if command == 'show-user':
             return json.dumps(self.show_user(user_name))
         if command == 'add-user':