Update file name.

Author: jburhenn

README.rst

@@ -167,7 +167,7 @@ General System Info
   General system info, including CPU, RAM, memory, etc. is retrieved via ``myDevices.os.systeminfo.py`` This is mostly implemented via a C library for the Raspberry Pi, though that will be changed to a Python only implementation in the future. If the C library doesn't work on your device you can disable the C library call until the Python implementation is available at which point you can modify it to support your board.
 
 Hardware Info
-  Hardware info, including make, model, etc. is retrieved via ``myDevices.cloud.vcom_id.py``. This should be modified or overridden to provide the appropriate hardware info for your board.
+  Hardware info, including make, model, etc. is retrieved via ``myDevices.os.hardware.py``. This should be modified or overridden to provide the appropriate hardware info for your board.
 
 Pin Mapping
   The mapping of the on-board pins is provided in ``myDevices.utils.version.py`` with the ``MAPPING`` list. This list provides the available GPIO pin numbers as well as the voltage ("V33", "V50"), ground ("GND") and do-not-connect ("DNC") pins. This should be updated with the mapping for your board. However, the Cayenne dashboard is currently built to display the Raspberry Pi GPIO layout so if your board's pin layout is significantly different it may not display correctly in the GPIO tab.

myDevices/test/processes_test.py

@@ -0,0 +1,11 @@
+import unittest
+from myDevices.os.services import ProcessManager
+
+class ProcessesTest(unittest.TestCase):
+    def testProcesses(self):
+        processManager = ProcessManager()
+        processManager.Run()
+        print(processManager.GetProcessList())
+        
+if __name__ == '__main__':
+    unittest.main()

myDevices/test/systeminfo_test.py

@@ -0,0 +1,78 @@
+import unittest
+from ctypes import CDLL, c_char_p
+from myDevices.os.systeminfo import SystemInfo
+from json import loads
+from myDevices.os.services import ProcessManager
+from myDevices.os.cpu import CpuInfo
+from time import sleep
+from myDevices.os.hardware import Hardware
+from myDevices.utils.logger import setInfo
+
+from psutil import cpu_times, virtual_memory
+from myDevices.sensors import sensors
+
+class SystemInfoTest(unittest.TestCase):
+    def setUp(self):
+        setInfo()
+        libSystemInformation=CDLL("/etc/myDevices/libs/libSystemInformation.so")
+        if libSystemInformation:
+            libSystemInformation.GetSystemInformation.restype=c_char_p
+            currentSystemInfo = libSystemInformation.GetSystemInformation().decode('utf-8')
+            libSystemInformation.FreeSystemInformation()
+        self.c_library_info = loads(currentSystemInfo)
+
+    def testSystemInfo(self):
+        system_info = SystemInfo()
+        info = loads(system_info.getSystemInformation())
+        # print('info type {}, {}'.format(type(info), info))
+        # info = loads(info)
+        print(info.keys())
+        # client = sensors.SensorsClient()
+        # sys_info = client.SystemInformation()
+        # print(sys_info['CpuLoad'])
+        # client.StopMonitoring()
+        cpu_info = info['Cpu']
+        print(cpu_info)
+        print(cpu_times())
+        self.assertEqual(set(cpu_info.keys()), set(('loadavg', 'usage', 'temperature')))
+        self.assertEqual(set(cpu_info['loadavg'].keys()), set(('one', 'five', 'ten')))
+        self.assertEqual(set(cpu_info['usage'].keys()), set(('user', 'nice', 'system', 'idle', 'iowait', 'irq', 'softirq', 'total', 'busy')))
+        memory_info = info['Memory']
+        print(memory_info)
+        self.assertEqual(set(memory_info.keys()), set(('total', 'free', 'used', 'buffers', 'cached', 'processes', 'swap')))
+        self.assertEqual(set(memory_info['swap'].keys()), set(('total', 'free', 'used')))
+        print(info['Uptime'])
+        for key in info['Storage'].keys():
+            print('{} : {}'.format(key, info['Storage'][key].keys()))
+        print(info['Storage'].keys())
+        print(info['Network'].keys())
+
+        # print(virtual_memory())
+
+    # def testSystemInfo(self):
+    #     hardware = Hardware()
+    #     print(hardware.getManufacturer())
+    #     print(hardware.getModel())
+    #     print(hardware.getMac())
+    #     info = loads(getSystemInformation())
+    #     print(info['Cpu'])
+    #     cpuLoad = GetCpuLoad()
+    #     print(cpuLoad.getcpuload())
+    #     processManager = ProcessManager()
+    #     data = {}
+    #     processManager.RefreshProcessManager()
+    #     data['VisibleMemory'] = processManager.VisibleMemory
+    #     data['AvailableMemory'] =  processManager.AvailableMemory
+    #     data['AverageProcessorUsage'] = processManager.AverageProcessorUsage
+    #     data['PeakProcessorUsage'] = processManager.PeakProcessorUsage
+    #     data['AverageMemoryUsage'] = processManager.AverageMemoryUsage
+    #     data['PeakMemoryUsage'] = processManager.AverageMemoryUsage
+    #     data['PercentProcessorTime'] = processManager.PercentProcessorTime
+    #     print(data)
+    #     for i in range(10):
+    #         sleep(5)
+    #         print(cpuLoad.getcpuload())
+        
+        
+if __name__ == '__main__':
+    unittest.main()

myDevices/test/user_test.py

@@ -0,0 +1,12 @@
+import pwd
+import os
+
+try:
+    user = pwd.getpwnam('cayenne')
+    user_id = user.pw_uid
+    group_id = user.pw_gid
+except KeyError:
+    user_id = os.environ['SUDO_UID']
+    group_id = os.environ['SUDO_GID']
+print(user_id)
+print(group_id)