grpc: Add a way to change discovery server address and to use an mqtt address which format is not <domain>:<port> but only <domain>

Author: emmlejeail

.editorconfig

@@ -2,7 +2,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace  = true

test_ttnmqtt.py

@@ -43,7 +43,7 @@ def closecallback(res, client):
         print(res)
         assert res
 
-    ttn_client = mqtt(appID, accessKey, mqttAddress)
+    ttn_client = mqtt(appID, accessKey, mqttAddress=mqttAddress)
     ttn_client.set_connect_callback(connectcallback)
     ttn_client.set_close_callback(closecallback)
     time.sleep(2)
@@ -56,7 +56,7 @@ def uplinkcallback(message, client):
         print(message)
         assert message.payload_raw == 'AQ=='
 
-    ttn_client = mqtt(appID, accessKey, mqttAddress)
+    ttn_client = mqtt(appID, accessKey, mqttAddress=mqttAddress)
     ttn_client.set_uplink_callback(uplinkcallback)
     time.sleep(2)
     ttn_client._MQTTClient__client.publish(
@@ -68,7 +68,7 @@ def uplinkcallback(message, client):
 
 def test_connect_error():
 
-    ttn_client = mqtt(appID, accessKey, 'badAddress:5555')
+    ttn_client = mqtt(appID, accessKey, mqttAddress='badAddress:5555')
     ttn_client.close()
     print(ttn_client.ErrorMsg)
     assert ttn_client.ErrorMsg == ("Connection failed: wrong appID,"
@@ -81,7 +81,7 @@ def downlinkcallback(mid, client):
         print(mid)
         assert mid == 2
 
-    ttn_client = mqtt(appID, accessKey, mqttAddress)
+    ttn_client = mqtt(appID, accessKey, mqttAddress=mqttAddress)
     ttn_client.set_downlink_callback(downlinkcallback)
     time.sleep(2)
     ttn_client.send('guest', "AQ==")
@@ -95,7 +95,7 @@ def downlinkcallback(mid, client):
         print(mid)
         assert mid == 2
 
-    ttn_client = mqtt(appID, accessKey, mqttAddress)
+    ttn_client = mqtt(appID, accessKey, mqttAddress=mqttAddress)
     ttn_client.set_downlink_callback(downlinkcallback)
     time.sleep(2)
     ttn_client.send('guest', {"field1": 1, "field2": 2})
@@ -109,7 +109,7 @@ def downlinkcallback(mid, client):
         print(mid)
         assert mid == 2
 
-    ttn_client = mqtt(appID, accessKey, mqttAddress)
+    ttn_client = mqtt(appID, accessKey, mqttAddress=mqttAddress)
     ttn_client.set_downlink_callback(downlinkcallback)
     time.sleep(2)
     ttn_client.send('guest', "AQ==", 2, True, "first")

ttnmqtt/ttnmqtt.py

@@ -58,12 +58,18 @@ class MyEvents(Events):
 
 class MQTTClient:
 
-    def __init__(self, appID, appAccessKey, mqttAddress=""):
+    def __init__(self, appID, appAccessKey, **kwargs):
         self.__client = mqtt.Client()
         self.__appID = appID
         self.__accessKey = appAccessKey
         self.__events = MyEvents()
-        self.__mqttAddress = mqttAddress
+        self.__mqttAddress = ""
+        self.__discoveryAddress = ""
+        for k, v in kwargs.iteritems():
+            if k == "mqttAddress":
+                self.__mqttAddress = v
+            if k == "discoveryAddress":
+                self.__discoveryAddress = v
         self.ErrorMsg = ""
         try:
             self.connect()
@@ -81,9 +87,12 @@ def connect(self):
         self.__client.username_pw_set(self.__appID, self.__accessKey)
         if self.__mqttAddress == "":
             creds = grpc.ssl_channel_credentials()
-            channel = grpc.secure_channel(
-                'discovery.thethings.network:1900',
-                creds)
+            if self.__discoveryAddress == "":
+                channel = grpc.secure_channel(
+                    'discovery.thethings.network:1900',
+                    creds)
+            else:
+                channel = grpc.secure_channel(self.__discoveryAddress, creds)
             stub = discovery_pb2_grpc.DiscoveryStub(channel)
             req = discovery_pb2.GetByAppIDRequest()
             req.app_id = self.__appID
@@ -94,10 +103,13 @@ def connect(self):
             port = int(split[1])
             self.__client.connect(address, port, 60)
         else:
-            split = self.__mqttAddress.split(':')
-            address = split[0]
-            port = int(split[1])
-            self.__client.connect(address, port, 60)
+            if ':' in self.__mqttAddress:
+                split = self.__mqttAddress.split(':')
+                address = split[0]
+                port = int(split[1])
+            else:
+                address = self.__mqttAddress
+        self.__client.connect(address, port, 60)
 
     def _onConnect(self):
         def on_connect(client, userdata, flags, rc):