Fixup PATH breakage in emc plug-in

The automated changes to remove absolute paths went a bit awry
with odd paths in /opt and other locations. Fix these up in the
emc plug-in.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

1 files changed, 59 insertions, 59 deletions

diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py
index 88b3ba21..7646ea2c 100644
--- a/sos/plugins/emc.py
+++ b/sos/plugins/emc.py
@@ -70,51 +70,51 @@ class emc(Plugin, RedHatPlugin):
     def get_symcli_config(self):
         """ EMC Solutions Enabler SYMCLI specific information - Symmetrix/DMX - commands
         """
-        self.add_cmd_output("/usr/symclisymcli -def")
-        self.add_cmd_output("/usr/symclisymdg list")
-        self.add_cmd_output("/usr/symclisymdg -v list")
-        self.add_cmd_output("/usr/symclisymcg list")
-        self.add_cmd_output("/usr/symclisymcg -v list")
-        self.add_cmd_output("/usr/symclisymcfg list")
-        self.add_cmd_output("/usr/symclisymcfg -v list")
-        self.add_cmd_output("/usr/symclisymcfg -db")
-        self.add_cmd_output("/usr/symclisymcfg -semaphores list")
-        self.add_cmd_output("/usr/symclisymcfg -dir all -v list")
-        self.add_cmd_output("/usr/symclisymcfg -connections list")
-        self.add_cmd_output("/usr/symclisymcfg -app -v list")
-        self.add_cmd_output("/usr/symclisymcfg -fa all -port list")
-        self.add_cmd_output("/usr/symclisymcfg -ra all -port list")
-        self.add_cmd_output("/usr/symclisymcfg -sa all -port list")
-        self.add_cmd_output("/usr/symclisymcfg list -lock")
-        self.add_cmd_output("/usr/symclisymcfg list -lockn all")
-        self.add_cmd_output("/usr/symclisyminq")
-        self.add_cmd_output("/usr/symclisyminq -v")
-        self.add_cmd_output("/usr/symclisyminq -symmids")
-        self.add_cmd_output("/usr/symclisyminq hba -fibre")
-        self.add_cmd_output("/usr/symclisyminq hba -scsi")
-        self.add_cmd_output("/usr/symclisymhost show -config")
-        self.add_cmd_output("/usr/symclistordaemon list")
-        self.add_cmd_output("/usr/symclistordaemon -v list")
-        self.add_cmd_output("/usr/symclisympd list")
-        self.add_cmd_output("/usr/symclisympd list -vcm")
-        self.add_cmd_output("/usr/symclisymdev list")
-        self.add_cmd_output("/usr/symclisymdev -v list")
-        self.add_cmd_output("/usr/symclisymdev -rdfa list")
-        self.add_cmd_output("/usr/symclisymdev -rdfa -v list")
-        self.add_cmd_output("/usr/symclisymbcv list")
-        self.add_cmd_output("/usr/symclisymbcv -v list")
-        self.add_cmd_output("/usr/symclisymrdf list")
-        self.add_cmd_output("/usr/symclisymrdf -v list")
-        self.add_cmd_output("/usr/symclisymrdf -rdfa list")
-        self.add_cmd_output("/usr/symclisymrdf -rdfa -v list")
-        self.add_cmd_output("/usr/symclisymsnap list")
-        self.add_cmd_output("/usr/symclisymsnap list -savedevs")
-        self.add_cmd_output("/usr/symclisymclone list")
-        self.add_cmd_output("/usr/symclisymevent list")
-        self.add_cmd_output("/usr/symclisymmask list hba")
-        self.add_cmd_output("/usr/symclisymmask list logins")
-        self.add_cmd_output("/usr/symclisymmaskdb list database")
-        self.add_cmd_output("/usr/symclisymmaskdb -v list database")
+        self.add_cmd_output("symclisymcli -def")
+        self.add_cmd_output("symclisymdg list")
+        self.add_cmd_output("symclisymdg -v list")
+        self.add_cmd_output("symclisymcg list")
+        self.add_cmd_output("symclisymcg -v list")
+        self.add_cmd_output("symclisymcfg list")
+        self.add_cmd_output("symclisymcfg -v list")
+        self.add_cmd_output("symclisymcfg -db")
+        self.add_cmd_output("symclisymcfg -semaphores list")
+        self.add_cmd_output("symclisymcfg -dir all -v list")
+        self.add_cmd_output("symclisymcfg -connections list")
+        self.add_cmd_output("symclisymcfg -app -v list")
+        self.add_cmd_output("symclisymcfg -fa all -port list")
+        self.add_cmd_output("symclisymcfg -ra all -port list")
+        self.add_cmd_output("symclisymcfg -sa all -port list")
+        self.add_cmd_output("symclisymcfg list -lock")
+        self.add_cmd_output("symclisymcfg list -lockn all")
+        self.add_cmd_output("symclisyminq")
+        self.add_cmd_output("symclisyminq -v")
+        self.add_cmd_output("symclisyminq -symmids")
+        self.add_cmd_output("symclisyminq hba -fibre")
+        self.add_cmd_output("symclisyminq hba -scsi")
+        self.add_cmd_output("symclisymhost show -config")
+        self.add_cmd_output("symclistordaemon list")
+        self.add_cmd_output("symclistordaemon -v list")
+        self.add_cmd_output("symclisympd list")
+        self.add_cmd_output("symclisympd list -vcm")
+        self.add_cmd_output("symclisymdev list")
+        self.add_cmd_output("symclisymdev -v list")
+        self.add_cmd_output("symclisymdev -rdfa list")
+        self.add_cmd_output("symclisymdev -rdfa -v list")
+        self.add_cmd_output("symclisymbcv list")
+        self.add_cmd_output("symclisymbcv -v list")
+        self.add_cmd_output("symclisymrdf list")
+        self.add_cmd_output("symclisymrdf -v list")
+        self.add_cmd_output("symclisymrdf -rdfa list")
+        self.add_cmd_output("symclisymrdf -rdfa -v list")
+        self.add_cmd_output("symclisymsnap list")
+        self.add_cmd_output("symclisymsnap list -savedevs")
+        self.add_cmd_output("symclisymclone list")
+        self.add_cmd_output("symclisymevent list")
+        self.add_cmd_output("symclisymmask list hba")
+        self.add_cmd_output("symclisymmask list logins")
+        self.add_cmd_output("symclisymmaskdb list database")
+        self.add_cmd_output("symclisymmaskdb -v list database")
 
     def get_navicli_config(self):
         """ EMC Navisphere Host Agent NAVICLI specific information - files
@@ -129,19 +129,19 @@ class emc(Plugin, RedHatPlugin):
     def get_navicli_SP_info(self,SP_address):
         """ EMC Navisphere Host Agent NAVICLI specific information - CLARiiON - commands
         """
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getall" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getsptime -spa" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getsptime -spb" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getlog" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getdisk" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getcache" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getlun" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getlun -rg -type -default -owner -crus -capacity" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s lunmapinfo" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s getcrus" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s port -list -all" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s storagegroup -list" % SP_address)
-        self.add_cmd_output("/opt/Navispherenavicli -h %s spportspeed -get" % SP_address)
+        self.add_cmd_output("navicli -h %s getall" % SP_address)
+        self.add_cmd_output("navicli -h %s getsptime -spa" % SP_address)
+        self.add_cmd_output("navicli -h %s getsptime -spb" % SP_address)
+        self.add_cmd_output("navicli -h %s getlog" % SP_address)
+        self.add_cmd_output("navicli -h %s getdisk" % SP_address)
+        self.add_cmd_output("navicli -h %s getcache" % SP_address)
+        self.add_cmd_output("navicli -h %s getlun" % SP_address)
+        self.add_cmd_output("navicli -h %s getlun -rg -type -default -owner -crus -capacity" % SP_address)
+        self.add_cmd_output("navicli -h %s lunmapinfo" % SP_address)
+        self.add_cmd_output("navicli -h %s getcrus" % SP_address)
+        self.add_cmd_output("navicli -h %s port -list -all" % SP_address)
+        self.add_cmd_output("navicli -h %s storagegroup -list" % SP_address)
+        self.add_cmd_output("navicli -h %s spportspeed -get" % SP_address)
 
     def check_enabled(self):
         self.packages = [ "EMCpower" ]
@@ -194,7 +194,7 @@ class emc(Plugin, RedHatPlugin):
             while CLARiiON_IP_loop == "stay_in":
                 ans = raw_input("CLARiiON SP IP Address or [Enter] to exit: ")
                 ## Check to make sure the CLARiiON SP IP address provided is valid
-                p = Popen("/opt/Navispherenavicli -h %s getsptime" % (ans,), shell=True, stdout=PIPE, stderr=PIPE)
+                p = Popen("navicli -h %s getsptime" % (ans,), shell=True, stdout=PIPE, stderr=PIPE)
                 out, err = p.communicate()
                 if p.returncode == 0:
                     CLARiiON_IP_address_list.append(ans)