Merge pull request #422 from jookies/v0.9

v0.9b3

.travis.yml

@@ -3,7 +3,7 @@ language: python
 python:
     - '2.7'
 env:
-    - ROOT_PATH=~/jasmin JASMIN_RELEASE=0.9b2
+    - ROOT_PATH=~/jasmin JASMIN_RELEASE=0.9b3
 # Command to install dependencies
 install:
     - python setup.py sdist

docker/Dockerfile

@@ -5,7 +5,7 @@ MAINTAINER Jookies LTD <jasmin@jookies.net>
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r jasmin && useradd -r -g jasmin jasmin
 
-ENV JASMIN_VERSION 0.9b2
+ENV JASMIN_VERSION 0.9b3
 
 # Install requirements
 RUN apt-get update && apt-get install -y \

jasmin/__init__.py

@@ -5,7 +5,7 @@
 
 MAJOR = 0
 MINOR = 9
-PATCH = 2
+PATCH = 3
 META = 'b'
 
 def get_version():

jasmin/managers/clients.py

@@ -172,11 +172,14 @@ def perspective_load(self, profile='jcli-prod'):
             cf = ConfigurationMigrator(context='smppccs', header=lines[0], data=''.join(lines[1:]))
 
             # Remove current configuration
+            CIDs = []
             for c in self.connectors:
-                remRet = yield self.perspective_connector_remove(c['id'])
+                CIDs.append(c['id'])
+            for cid in CIDs:
+                remRet = yield self.perspective_connector_remove(cid)
                 if not remRet:
-                    raise ConfigProfileLoadingError('Error removing connector %s' % c['id'])
-                self.log.info('Removed connector [%s]', c['id'])
+                    raise ConfigProfileLoadingError('Error removing connector %s' % cid)
+                self.log.info('Removed connector [%s]', cid)
 
             # Apply configuration
             loadedConnectors = cf.getMigratedData()

jasmin/managers/test/test_managers.py

@@ -324,6 +324,30 @@ def test_persitance_flag(self):
         self.assertFalse(isPersisted)
         yield self.persist('profile')
 
+    @defer.inlineCallbacks
+    def test_add_many_persist_and_load_default(self):
+        "Related to #420"
+        yield self.connect('127.0.0.1', self.pbPort)
+
+        # Add many
+        yield self.add(SMPPClientConfig(id='IPBANK'))
+        yield self.add(SMPPClientConfig(id='UPBANK'))
+        yield self.add(SMPPClientConfig(id='ITEL'))
+        yield self.add(SMPPClientConfig(id='MOBILMATIC'))
+        yield self.add(SMPPClientConfig(id='SMSGH'))
+        listRet = yield self.connector_list()
+        self.assertEqual(5, len(listRet))
+
+        # Persist
+        yield self.persist()
+
+        # Load
+        yield self.load()
+
+        # List and assert
+        listRet = yield self.connector_list()
+        self.assertEqual(5, len(listRet))
+
 class ClientConnectorTestCases(SMPPClientPBProxyTestCase):
     @defer.inlineCallbacks
     def test_add_and_list(self):

jasmin/protocols/smpp/protocol.py

@@ -244,6 +244,10 @@ def preSubmitSm(self, pdu):
             else:
                 pdu.params['data_coding'] = None
 
+        # Set default source_addr if not defined
+        if pdu.params['source_addr'] is None and self.config().source_addr is not None:
+            pdu.params['source_addr'] = self.config().source_addr
+
     def doSendRequest(self, pdu, timeout):
         if self.connectionCorrupted:
             raise SMPPClientConnectionCorruptedError()

jasmin/protocols/smpp/test/smsc_simulator.py

@@ -120,7 +120,7 @@ def sendSubmitSmResponse(self, reqPDU):
 
         self.lastSubmitSmRestPDU = reqPDU.requireAck(reqPDU.seqNum,
             status=CommandStatus.ESME_ROK,
-            message_id = msgid,
+            message_id=msgid,
             )
         self.sendPDU(self.lastSubmitSmRestPDU)