handle ussd message

praekelt · Jan 18, 2014 · e9dde9c · e9dde9c
1 parent e9367a6
commit e9dde9c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/txssmi/commands.py b/txssmi/commands.py
@@ -30,3 +30,4 @@
 PremiumMoMessage = SSMIResponse.create('PREMIUM_MO')
 PremiumBMoMessage = SSMIResponse.create('PREMIUM_BINARY_MO')
 IMSILookupReply = SSMIResponse.create('IMSI_LOOKUP_REPLY')
+USSDMessage = SSMIResponse.create('USSD_MESSAGE')
diff --git a/txssmi/constants.py b/txssmi/constants.py
@@ -31,6 +31,7 @@
     '107': ('PREMIUM_MO', ['msisdn', 'sequence', 'destination', 'message']),
     '108': ('PREMIUM_BINARY_MO', ['msisdn', 'sequence', 'pid', 'coding',
                                   'destination', 'hex_msg']),
+    '110': ('USSD_MESSAGE', ['msisdn', 'type', 'phase', 'message']),
     '600': ('IMSI_LOOKUP_REPLY', ['sequence', 'msisdn', 'imsi', 'spid']),
 }
 
@@ -50,9 +51,14 @@
 USSD_NEW = '1'
 USSD_RESPONSE = '2'
 USSD_END = '3'
+USSD_TIMEOUT = '4'
 USSD_REDIRECT = '5'
 USSD_INITIATE = '6'
 
+USSD_PHASE_UNKNOWN = '0'
+USSD_PHASE_1 = '1'
+USSD_PHASE_2 = '2'
+
 ACK_LOGIN_OK = '1'
 ACK_LINK_CHECK_RESPONSE = '2'
 

diff --git a/txssmi/protocol.py b/txssmi/protocol.py
@@ -167,3 +167,6 @@ def handle_PREMIUM_MO(self, pmo):
 
     def handle_PREMIUM_BINARY_MO(self, bmo):
         log.msg('Received PREMIUM_BINARY_MO: %r' % (bmo,))
+
+    def handle_USSD_MESSAGE(self, um):
+        log.msg('Received USSD_MESSAGE: %r' % (um,))
diff --git a/txssmi/tests/test_protocol.py b/txssmi/tests/test_protocol.py
@@ -9,10 +9,11 @@
 from txssmi.builder import SSMIRequest
 from txssmi.commands import (
     Login, Ack, IMSILookupReply, Seq, MoMessage, DrMessage, FFMessage,
-    BMoMessage, PremiumMoMessage, PremiumBMoMessage)
+    BMoMessage, PremiumMoMessage, PremiumBMoMessage, USSDMessage)
 from txssmi.protocol import SSMIProtocol
 from txssmi.constants import (
-    CODING_8BIT, PROTOCOL_ENHANCED, USSD_INITIATE, USSD_NEW, DR_SUCCESS)
+    CODING_8BIT, PROTOCOL_ENHANCED, USSD_INITIATE, USSD_NEW, DR_SUCCESS,
+    USSD_PHASE_2, USSD_TIMEOUT)
 
 
 class ProtocolTestCase(TestCase):
@@ -225,8 +226,17 @@ def test_premium_binary_mo(self):
         self.patch(self.protocol_class, 'handle_PREMIUM_BINARY_MO',
                    calls.append)
         cmd = PremiumBMoMessage(msisdn='2700000000', sequence='1',
-                                     coding=CODING_8BIT, pid=PROTOCOL_ENHANCED,
-                                     hex_msg=binascii.hexlify('hello'),
-                                     destination='foo')
+                                coding=CODING_8BIT, pid=PROTOCOL_ENHANCED,
+                                hex_msg=binascii.hexlify('hello'),
+                                destination='foo')
+        yield self.send(cmd)
+        self.assertEqual([cmd], calls)
+
+    @inlineCallbacks
+    def test_ussd_message(self):
+        calls = []
+        self.patch(self.protocol_class, 'handle_USSD_MESSAGE', calls.append)
+        cmd = USSDMessage(msisdn='2700000000', type=USSD_TIMEOUT,
+                          phase=USSD_PHASE_2, message='foo')
         yield self.send(cmd)
         self.assertEqual([cmd], calls)