[sunbeam] Add deployment commands

* Update some commands that now need a sunbeam_user
* manifest show doesn't need --id any more
* Move the cluster commands under the user

Closes: #4037
Closes: #4038

Signed-off-by: Arif Ali <arif.ali@canonical.com>

Author: arif-ali

sos/report/plugins/sunbeam.py

@@ -44,21 +44,6 @@ def setup(self):
             '/var/snap/openstack/current/config.yaml',
         ])
 
-        self.add_cmd_output([
-            'sunbeam cluster list',
-            'sunbeam cluster list --format yaml',
-            'sunbeam manifest list',
-        ], snap_cmd=True)
-
-        manifest_raw = self.collect_cmd_output(
-            'sunbeam manifest list --format yaml')
-
-        if manifest_raw['status'] == 0:
-            manifests = yaml.safe_load(manifest_raw['output'])
-            for manifest in manifests:
-                self.add_cmd_output(
-                    f'sunbeam manifest show --id {manifest["manifestid"]}')
-
         sunbeam_user = self.get_option("sunbeam-user")
         try:
             user_pwd = pwd.getpwnam(sunbeam_user)
@@ -71,12 +56,47 @@ def setup(self):
             return
 
         if user_pwd:
+            self.add_cmd_output([
+                'sunbeam cluster list',
+                'sunbeam cluster list --format yaml',
+                'sunbeam manifest list',
+                'sunbeam deployment list',
+            ], snap_cmd=True, runas=sunbeam_user)
+
+            manifest_raw = self.collect_cmd_output(
+                'sunbeam manifest list --format yaml',
+                runas=sunbeam_user
+            )
+
+            if manifest_raw['status'] == 0:
+                manifests = yaml.safe_load(manifest_raw['output'])
+                for manifest in manifests:
+                    self.add_cmd_output(
+                        f'sunbeam manifest show {manifest["manifestid"]}',
+                        snap_cmd=True, runas=sunbeam_user
+                    )
+
+            deployment_raw = self.collect_cmd_output(
+                'sunbeam deployment list --format yaml',
+                runas=sunbeam_user
+            )
+
+            if deployment_raw['status'] == 0:
+                deployments = yaml.safe_load(deployment_raw['output'])
+                for deployment in deployments['deployments']:
+                    self.add_cmd_output([
+                        f'sunbeam deployment show {deployment["name"]}',
+                        f'sunbeam deployment show {deployment["name"]} '
+                        '--format yaml',
+                    ], snap_cmd=True, runas=sunbeam_user)
+
             sb_snap_homedir = f'{user_pwd.pw_dir}/snap/openstack/common'
 
             self.add_copy_spec([
                 f"{sb_snap_homedir}/*.log",
                 f"{sb_snap_homedir}/etc/*/*.log",
                 f"{sb_snap_homedir}/logs/*.log",
+                f"{sb_snap_homedir}/reports/*.yaml",
             ])
 
             if self.get_option("juju-allow-login"):