Merge pull request #11 from myDevicesIoT/feature/activate-with-version

Send agent version when activating.

Author: jburhenn

myDevices/cloud/apiclient.py

@@ -1,11 +1,15 @@
-from myDevices.requests_futures.sessions import FuturesSession
-from concurrent.futures import ThreadPoolExecutor
 import json
-from myDevices.utils.logger import error, exception
-from myDevices.system.hardware import Hardware
-from myDevices.system.systeminfo import SystemInfo
+from concurrent.futures import ThreadPoolExecutor
+
+from myDevices import __version__
 from myDevices.cloud import cayennemqtt
 from myDevices.devices.digital.gpio import NativeGPIO
+from myDevices.requests_futures.sessions import FuturesSession
+from myDevices.system.hardware import Hardware
+from myDevices.system.systeminfo import SystemInfo
+from myDevices.utils.config import Config, APP_SETTINGS
+from myDevices.utils.logger import error, exception
+
 
 class CayenneApiClient:
     def __init__(self, host):
@@ -56,6 +60,8 @@ def getMessageBody(self, inviteCode):
             system_data = []
             cayennemqtt.DataChannel.add(system_data, cayennemqtt.SYS_HARDWARE_MAKE, value=hardware.getManufacturer(), type='string', unit='utf8')
             cayennemqtt.DataChannel.add(system_data, cayennemqtt.SYS_HARDWARE_MODEL, value=hardware.getModel(), type='string', unit='utf8')
+            config = Config(APP_SETTINGS)
+            cayennemqtt.DataChannel.add(system_data, cayennemqtt.AGENT_VERSION, value=config.get('Agent', 'Version', __version__))
             system_info = SystemInfo()
             capacity_data = system_info.getMemoryInfo((cayennemqtt.CAPACITY,))
             capacity_data += system_info.getDiskInfo((cayennemqtt.CAPACITY,))

myDevices/test/apiclient_test.py

@@ -8,11 +8,14 @@ class ApiClientTest(unittest.TestCase):
     def testMessageBody(self):
         cayenneApiClient = CayenneApiClient('https://api.mydevices.com')
         message = loads(cayenneApiClient.getMessageBody('invite_code'))
+        # info(message)
         self.assertIn('id', message)
         self.assertIn('type', message)
         self.assertIn('hardware_id', message)
         self.assertIn('properties', message)
         self.assertIn('sysinfo', message['properties'])
+        channels = [item['channel'] for item in message['properties']['sysinfo']]
+        self.assertCountEqual(['sys:hw:make', 'sys:hw:model', 'agent:version', 'sys:ram;capacity', 'sys:storage:/;capacity'], channels)
         self.assertIn('pinmap', message['properties'])
 
 

myDevices/utils/config.py

@@ -1,6 +1,8 @@
 from configparser import RawConfigParser, _UNSET, NoSectionError
 from threading import RLock
 
+APP_SETTINGS = '/etc/myDevices/AppSettings.ini'
+
 class Config:
     def __init__(self, path):
         self.mutex = RLock()