Tear down PDP context after sending socket messages (#90)

* Tear down PDP context on socket close

* don't expect timeout call, simplify close socket call

Author: DomAmato

Hologram/Network/Modem/BG96.py

@@ -78,6 +78,7 @@ def close_socket(self, socket_identifier=None):
         if ok != ModemResult.OK:
             self.logger.error('Failed to close socket')
         self.urc_state = Modem.SOCKET_CLOSED
+        self._tear_down_pdp_context()
 
     def write_socket(self, data):
         hexdata = binascii.hexlify(data)
@@ -184,6 +185,15 @@ def _set_up_pdp_context(self):
         else:
             self.logger.info('PDP context active')
 
+    def _tear_down_pdp_context(self):
+        if not self._is_pdp_context_active(): return True
+        self.logger.info('Tearing down PDP context')
+        ok, _ = self.set('+QIACT', '0', timeout=30)
+        if ok != ModemResult.OK:
+            self.logger.error('PDP Context tear down failed')
+        else:
+            self.logger.info('PDP context deactivated')
+
     @property
     def description(self):
         return 'Quectel BG96'

Hologram/Network/Modem/Modem.py

@@ -721,6 +721,15 @@ def _set_up_pdp_context(self):
         else:
             self.logger.info('PDP context active')
 
+    def _tear_down_pdp_context(self):
+        if not self._is_pdp_context_active(): return True
+        self.logger.info('Tearing down PDP context')
+        ok, _ = self.set('+UPSDA', '0,4', timeout=30)
+        if ok != ModemResult.OK:
+            self.logger.error('PDP Context tear down failed')
+        else:
+            self.logger.info('PDP context deactivated')
+
 
     def __enforce_serial_port_open(self):
         if not (self.serial_port and self.serial_port.isOpen()):

Hologram/Network/Modem/NovaM.py

@@ -48,15 +48,6 @@ def set_network_registration_status(self):
     def is_registered(self):
         return self.check_registered('+CEREG')
 
-    def close_socket(self, socket_identifier=None):
-
-        if socket_identifier is None:
-            socket_identifier = self.socket_identifier
-
-        ok, r = self.set('+USOCL', "%s" % socket_identifier, timeout=40)
-        if ok != ModemResult.OK:
-            self.logger.error('Failed to close socket')
-
     @property
     def description(self):
         modemtype = '(R410)' if self.is_r410 else '(R404)'

Hologram/Network/Modem/Nova_U201.py

@@ -50,6 +50,10 @@ def create_socket(self):
         self._set_up_pdp_context()
         super().create_socket()
 
+    def close_socket(self, socket_identifier=None):
+        super().close_socket(socket_identifier)
+        self._tear_down_pdp_context()
+
     def is_registered(self):
         return self.check_registered('+CREG') or self.check_registered('+CGREG')
 

tests/Modem/test_NovaM.py

@@ -73,15 +73,15 @@ def test_close_socket_no_args(mock_set, no_serial_port):
     mock_set.return_value = (0,0)
     mock_set.reset_mock()
     modem.close_socket()
-    mock_set.assert_called_once_with('+USOCL', '0', timeout=40)
+    mock_set.assert_called_once_with('+USOCL', '0')
 
 @patch.object(NovaM, 'set')
 def test_close_socket_with_socket_identifier(mock_set, no_serial_port):
     modem = NovaM()
     mock_set.return_value = (0,0)
     mock_set.reset_mock()
     modem.close_socket(5)
-    mock_set.assert_called_once_with('+USOCL', '5', timeout=40)
+    mock_set.assert_called_once_with('+USOCL', '5')
 
 @patch.object(NovaM, 'command')
 def test_set_network_registration_status(mock_command, no_serial_port):