Merge pull request #5122 from c-po/op-mode-sensors

op-mode: T8483: fix /show_sensors.py: No such file or directory

Author: sever-sever

op-mode-definitions/show-environment.xml.in

@@ -11,8 +11,7 @@
             <properties>
               <help>Show hardware monitoring results</help>
             </properties>
-            <!-- Linux always adds "hypervisor" to CPU flags -->
-	    <command>bash -c 'if ! grep -q hypervisor /proc/cpuinfo; then ${vyos_op_scripts_dir}/show_sensors.py; else echo "VyOS running under hypervisor, no sensors available"; fi'</command>
+	          <command>${vyos_op_scripts_dir}/show_sensors.py</command>
           </leafNode>
         </children>
       </node>

src/op_mode/show_sensors.py

@@ -17,25 +17,26 @@
 
 import re
 import sys
+
 from vyos.utils.process import popen
 from vyos.utils.process import DEVNULL
 
-output,retcode = popen("sensors --no-adapter",  stderr=DEVNULL)
+output, retcode = popen("sensors --no-adapter", stderr=DEVNULL)
 if retcode == 0:
     print (output)
     sys.exit(0)
 else:
-    output,retcode = popen("sensors-detect --auto",stderr=DEVNULL)
-    match = re.search(r'#----cut here----(.*)#----cut here----',output, re.DOTALL)
+    output, retcode = popen("sensors-detect --auto", stderr=DEVNULL)
+    match = re.search(r'#----cut here----(.*)#----cut here----', output,
+                      re.DOTALL)
     if match:
         for module in match.group(0).split('\n'):
             if not module.startswith("#"):
                 popen("modprobe {}".format(module.strip()))
-                output,retcode = popen("sensors --no-adapter",  stderr=DEVNULL)
+                output, retcode = popen("sensors --no-adapter", stderr=DEVNULL)
                 if retcode == 0:
-                    print (output)
+                    print(output)
                     sys.exit(0)
 
-
-print ("No sensors found")
+print("No sensors found")
 sys.exit(1)