Publish a status event when unbinding for SMPP transport

praekeltfoundation · Oct 20, 2015 · 278396c · 278396c
1 parent 233c837
commit 278396c
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 0 deletions.
diff --git a/vumi/transports/smpp/protocol.py b/vumi/transports/smpp/protocol.py
@@ -574,6 +574,7 @@ def query_sm(self,
     def unbind(self):
         sequence_number = yield self.sequence_generator.next()
         self.send_pdu(Unbind(sequence_number))
+        yield self.service.on_smpp_unbinding()
         returnValue([sequence_number])
 
     def handle_unbind_resp(self, pdu):

diff --git a/vumi/transports/smpp/smpp_service.py b/vumi/transports/smpp/smpp_service.py
@@ -201,6 +201,10 @@ def on_smpp_bind(self):
     def on_smpp_binding(self):
         yield self.transport.on_smpp_binding()
 
+    @inlineCallbacks
+    def on_smpp_unbinding(self):
+        yield self.transport.on_smpp_unbinding()
+
     @inlineCallbacks
     def on_smpp_bind_timeout(self):
         yield self.transport.on_smpp_bind_timeout()

diff --git a/vumi/transports/smpp/smpp_transport.py b/vumi/transports/smpp/smpp_transport.py
@@ -309,6 +309,10 @@ def _reject_for_invalid_address(self, message, field):
     def on_smpp_binding(self):
         yield self.publish_status_binding()
 
+    @inlineCallbacks
+    def on_smpp_unbinding(self):
+        yield self.publish_status_unbinding()
+
     @inlineCallbacks
     def on_smpp_bind(self):
         yield self.publish_status_bound()
@@ -350,6 +354,13 @@ def publish_status_binding(self):
             type='binding',
             message='Binding')
 
+    def publish_status_unbinding(self):
+        return self.publish_status(
+            status='down',
+            component='smpp',
+            type='unbinding',
+            message='Unbinding')
+
     def publish_status_bound(self):
         return self.publish_status(
             status='ok',

diff --git a/vumi/transports/smpp/tests/test_protocol.py b/vumi/transports/smpp/tests/test_protocol.py
@@ -45,6 +45,9 @@ def on_connection_lost(self, reason):
     def on_smpp_binding(self):
         pass
 
+    def on_smpp_unbinding(self):
+        pass
+
     def on_smpp_bind(self):
         self.paused = False
 

diff --git a/vumi/transports/smpp/tests/test_smpp_service.py b/vumi/transports/smpp/tests/test_smpp_service.py
@@ -48,6 +48,9 @@ def unpause_connectors(self):
     def on_smpp_binding(self):
         pass
 
+    def on_smpp_unbinding(self):
+        pass
+
     def on_smpp_bind(self):
         pass
 

diff --git a/vumi/transports/smpp/tests/test_smpp_transport.py b/vumi/transports/smpp/tests/test_smpp_transport.py
@@ -1731,6 +1731,18 @@ def test_connect_status(self):
         self.assertEqual(msg['type'], 'binding')
         self.assertEqual(msg['message'], 'Binding')
 
+    @inlineCallbacks
+    def test_unbinding_status(self):
+        transport = yield self.get_transport({'publish_status': True})
+        self.tx_helper.clear_dispatched_statuses()
+        yield transport.service.get_protocol().unbind()
+
+        [msg] = self.tx_helper.get_dispatched_statuses()
+        self.assertEqual(msg['status'], 'down')
+        self.assertEqual(msg['component'], 'smpp')
+        self.assertEqual(msg['type'], 'unbinding')
+        self.assertEqual(msg['message'], 'Unbinding')
+
     @inlineCallbacks
     def test_bind_status(self):
         yield self.get_transport({'publish_status': True}, bind=False)