Validation of carrier available for every board.

Author: tomekmalek

LiveObjects/hal.py

@@ -6,6 +6,7 @@
 
 import os
 import time
+import sys
 
 import LiveObjects
 
@@ -38,6 +39,11 @@ def mqtt_lib_import_str(lang):
     def get_security_level(self):
         pass
 
+    def check_network_capabilities(self, net_type):
+        if net_type not in self._carrier_capability:
+            print('Carrier not supported.')
+            sys.exit()
+
     def network_connect(self):
         pass
 
@@ -53,12 +59,14 @@ class GPy(BoardsInterface):
     def __init__(self, net_type):
         self._lang = 'microPython'
         self._net_type = BoardsInterface.WIFI if net_type == BoardsInterface.DEFAULT_CARRIER else net_type
+        self._carrier_capability = (BoardsInterface.WIFI, BoardsInterface.LTE)
         self._wifi_tls_capability = True
         self._lte_tls_capability = False
         self._mqtt_lib = super().mqtt_lib_import_str(self._lang)
         self._credentials = super().create_credentials(self._net_type)
 
     def network_connect(self):
+        super().check_network_capabilities(self._net_type)
         if self._net_type == BoardsInterface.WIFI:
             pycom_wifi_connect(self._credentials.get_creds()['ssid'], self._credentials.get_creds()['password'])
         elif self._net_type == BoardsInterface.LTE:
@@ -74,19 +82,19 @@ def get_security_level(self):
 class Esp8266(BoardsInterface):
     def __init__(self, net_type):
         self._lang = 'microPython'
-        self._net_type = BoardsInterface.WIFI if net_type == BoardsInterface.DEFAULT_CARRIER else None
+        self._net_type = BoardsInterface.WIFI if net_type == BoardsInterface.DEFAULT_CARRIER else net_type
+        self._carrier_capability = (BoardsInterface.WIFI,)
         self._wifi_tls_capability = False
         self._wifi_lte_capability = False
         self._mqtt_lib = super().mqtt_lib_import_str(self._lang)
-        self._credentials = super().create_credentials(BoardsInterface.WIFI)
+        self._credentials = super().create_credentials(self._net_type)
 
     def network_connect(self):
-        if self._net_type == BoardsInterface.WIFI:
-            wifi_connect(self._credentials.get_creds()['ssid'], self._credentials.get_creds()['password'])
+        super().check_network_capabilities(self._net_type)
+        wifi_connect(self._credentials.get_creds()['ssid'], self._credentials.get_creds()['password'])
 
     def get_security_level(self):
-        if self._net_type == BoardsInterface.WIFI:
-            return LiveObjects.SSL if self._wifi_tls_capability else LiveObjects.NONE
+        return LiveObjects.SSL if self._wifi_tls_capability else LiveObjects.NONE
 
 
 class Win32(BoardsInterface):
@@ -96,37 +104,37 @@ class Win32(BoardsInterface):
 class Esp32(BoardsInterface):
     def __init__(self, net_type):
         self._lang = 'microPython'
-        self._net_type = BoardsInterface.WIFI if net_type == BoardsInterface.DEFAULT_CARRIER else None
+        self._net_type = BoardsInterface.WIFI if net_type == BoardsInterface.DEFAULT_CARRIER else net_type
+        self._carrier_capability = (BoardsInterface.WIFI,)
         self._wifi_tls_capability = True
         self._wifi_lte_capability = False
         self._mqtt_lib = super().mqtt_lib_import_str(self._lang)
-        self._credentials = super().create_credentials(BoardsInterface.WIFI)
+        self._credentials = super().create_credentials(self._net_type)
 
     def network_connect(self):
-        if self._net_type == BoardsInterface.WIFI:
-            wifi_connect(self._credentials.get_creds()['ssid'], self._credentials.get_creds()['password'])
+        super().check_network_capabilities(self._net_type)
+        wifi_connect(self._credentials.get_creds()['ssid'], self._credentials.get_creds()['password'])
 
     def get_security_level(self):
-        if self._net_type == BoardsInterface.WIFI:
-            return LiveObjects.SSL if self._wifi_tls_capability else LiveObjects.NONE
+        return LiveObjects.SSL if self._wifi_tls_capability else LiveObjects.NONE
 
 
 class Linux(BoardsInterface):
     def __init__(self, net_type):
         self._lang = 'Python'
-        self._net_type = BoardsInterface.EXISTING_NETWORK if net_type == BoardsInterface.DEFAULT_CARRIER else None
+        self._net_type = BoardsInterface.EXISTING_NETWORK if net_type == BoardsInterface.DEFAULT_CARRIER else net_type
+        self._carrier_capability = (BoardsInterface.EXISTING_NETWORK,)
         self._wifi_tls_capability = True
         self._wifi_lte_capability = False
         self._mqtt_lib = super().mqtt_lib_import_str(self._lang)
         self._credentials = super().create_credentials(self._net_type)
 
     def network_connect(self):
-        if self._net_type == BoardsInterface.EXISTING_NETWORK:
-            use_existing_network_connection()
+        super().check_network_capabilities(self._net_type)
+        use_existing_network_connection()
 
     def get_security_level(self):
-        if self._net_type == BoardsInterface.EXISTING_NETWORK:
-            return LiveObjects.SSL if self._wifi_tls_capability else LiveObjects.NONE
+        return LiveObjects.SSL if self._wifi_tls_capability else LiveObjects.NONE
 
 
 class BoardsFactory:
@@ -159,7 +167,6 @@ def wifi_connect(ssid, password):
 CONN_TIMEOUT = 20
 
 
-# noinspection PyUnresolvedReferences
 def pycom_wifi_connect(ssid, password):
     from network import WLAN
 
@@ -171,15 +178,14 @@ def pycom_wifi_connect(ssid, password):
         wlan.connect(ssid=ssid, auth=(WLAN.WPA2, password))
         time.sleep_ms(3000)
         if wlan.isconnected():
-            print("WiFi connected succesfully")
+            print("WiFi connected successfully")
             print('IPs:', wlan.ifconfig(), 'Channel:', wlan.channel())
             break
         elif time.time() - start_time > CONN_TIMEOUT:
             print("WiFi not connected. Stopped.")
             break
 
 
-# noinspection PyUnresolvedReferences
 def lte_connect(pin):
 
     from network import LTE