[sapnw] implement collect_cmd_output API change

Since e8bb94c, collect_cmd_output returns a dict instead of filename.
Reflect the change in testing command output.

Resolves: #1859

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/sos/plugins/sapnw.py b/sos/plugins/sapnw.py
index 9ce9c8ed..8e2b262a 100644
--- a/sos/plugins/sapnw.py
+++ b/sos/plugins/sapnw.py
@@ -32,14 +32,13 @@ class sapnw(Plugin, RedHatPlugin):
             "/usr/sap/hostctrl/exe/saphostctrl -function ListInstances",
             suggest_filename="SAPInstances"
         )
-        if not inst_out:
+        if inst_out['status'] != 0:
             return
 
         sidsunique = set()
         # Cycle through all the instances, get 'sid', 'instance_number'
         # and 'vhost' to determine the proper profile
-        p = open(inst_out, "r").read().splitlines()
-        for inst_line in p:
+        for inst_line in inst_out['output'].splitlines():
             if "DAA" not in inst_line:
                 fields = inst_line.strip().split()
                 sid = fields[3]
@@ -99,11 +98,10 @@ class sapnw(Plugin, RedHatPlugin):
             suggest_filename="SAPDatabases"
         )
 
-        if not db_out:
+        if db_out['status'] != 0:
             return
 
-        dbl = open(db_out, "r").read().splitlines()
-        for line in dbl:
+        for line in db_out['output'].splitlines():
             if "Instance name" in line:
                 fields = line.strip().split()
                 dbadm = fields[2][:-1]