Add broker image, fix port numbers

Author: scholzj

.circleci/config.yml

@@ -4,10 +4,15 @@ jobs:
     working_directory: ~/circulate
     docker:
       - image: centos:7
+    docker:
+      - image: ecmi/fixml:sim
     steps:
       - run:
           name: Install Git
           command: yum install -y git
+      - run:
+          name: Add hosts record
+          command: echo 127.0.0.1 ecag-fixml-dev1 | sudo tee -a /etc/hosts
       - checkout
       - run:
           name: Install dependencies

.travis.yml

@@ -15,12 +15,12 @@
 class CppBindingTests(unittest.TestCase):
     def setUp(self):
         hostname = "ecag-fixml-dev1"
-        port = 35671
+        port = 5671
         accountName = "ABCFR_ABCFRALMMACC1"
         self.options = Options(hostname, port, accountName, timeout=5)
 
     def test_broadcastReceiver(self):
-        broadcaster = Broadcaster(self.options.hostname, 35672, "admin", "admin", "broadcast", "broadcast.ABCFR.TradeConfirmation", 1)
+        broadcaster = Broadcaster(self.options.hostname, 5672, "admin", "admin", "broadcast", "broadcast.ABCFR.TradeConfirmation", 1)
         broadcaster.run()
 
         br = BroadcastReceiver(self.options)
@@ -29,7 +29,7 @@ def test_broadcastReceiver(self):
         self.assertGreaterEqual(br.message_counter, 1)
 
     def test_requestResponse(self):
-        responder = Responder(self.options.hostname, 35672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
+        responder = Responder(self.options.hostname, 5672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
         responder.start()
 
         rr = RequestResponse(self.options)
@@ -38,7 +38,7 @@ def test_requestResponse(self):
         self.assertGreaterEqual(rr.message_counter, 1)
 
     def test_amqp10BroadcastReceiver(self):
-        broadcaster = Broadcaster(self.options.hostname, 35672, "admin", "admin", "broadcast", "broadcast.ABCFR.TradeConfirmation", 1)
+        broadcaster = Broadcaster(self.options.hostname, 5672, "admin", "admin", "broadcast", "broadcast.ABCFR.TradeConfirmation", 1)
         broadcaster.run()
 
         br = Amqp10BroadcastReceiver(self.options)
@@ -47,7 +47,7 @@ def test_amqp10BroadcastReceiver(self):
         self.assertGreaterEqual(br.message_counter, 1)
 
     def test_amqp10RequestResponse(self):
-        responder = Responder(self.options.hostname, 35672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
+        responder = Responder(self.options.hostname, 5672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
         responder.start()
 
         rr = Amqp10RequestResponse(self.options)
@@ -56,4 +56,4 @@ def test_amqp10RequestResponse(self):
         self.assertGreaterEqual(rr.message_counter, 1)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

tests/test_CppBinding.py

@@ -15,7 +15,7 @@
 class ProtonTests(unittest.TestCase):
     def setUp(self):
         hostname = "ecag-fixml-dev1"
-        port = 35671
+        port = 5671
         accountName = "ABCFR_ABCFRALMMACC1"
         accountPrivateKey = "./tests/resources/ABCFR_ABCFRALMMACC1.pem"
         accountPublicKey = "./tests/resources/ABCFR_ABCFRALMMACC1.crt"
@@ -24,7 +24,7 @@ def setUp(self):
         self.options = Options(hostname, port, accountName, accountPublicKey, accountPrivateKey, brokerPublicKey, timeout)
 
     def test_broadcastReceiver(self):
-        broadcaster = Broadcaster(self.options.hostname, 35672, "admin", "admin", "broadcast", "broadcast.ABCFR.TradeConfirmation", 1)
+        broadcaster = Broadcaster(self.options.hostname, 5672, "admin", "admin", "broadcast", "broadcast.ABCFR.TradeConfirmation", 1)
         broadcaster.run()
 
         br = BroadcastReceiver(self.options)
@@ -33,7 +33,7 @@ def test_broadcastReceiver(self):
         self.assertGreaterEqual(br.message_counter, 1)
 
     def test_requestResponse(self):
-        responder = Responder(self.options.hostname, 35672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
+        responder = Responder(self.options.hostname, 5672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
         responder.start()
 
         rr = RequestResponse(self.options)
@@ -42,7 +42,7 @@ def test_requestResponse(self):
         self.assertGreaterEqual(rr.message_counter, 1)
 
     def test_blockingBroadcastReceiver(self):
-        broadcaster = Broadcaster(self.options.hostname, 35672, "admin", "admin", "broadcast",
+        broadcaster = Broadcaster(self.options.hostname, 5672, "admin", "admin", "broadcast",
                                   "broadcast.ABCFR.TradeConfirmation", 1)
         broadcaster.run()
 
@@ -52,7 +52,7 @@ def test_blockingBroadcastReceiver(self):
         self.assertGreaterEqual(br.message_counter, 1)
 
     def test_blockingRequestResponse(self):
-        responder = Responder(self.options.hostname, 35672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
+        responder = Responder(self.options.hostname, 5672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
         responder.start()
 
         rr = BlockingRequestResponse(self.options)
@@ -61,4 +61,4 @@ def test_blockingRequestResponse(self):
         self.assertGreaterEqual(rr.message_counter, 1)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

tests/test_Proton.py

@@ -13,15 +13,15 @@
 class PurePythonTests(unittest.TestCase):
     def setUp(self):
         hostname = "ecag-fixml-dev1"
-        port = 35671
+        port = 5671
         accountName = "ABCFR_ABCFRALMMACC1"
         accountPrivateKey = "./tests/resources/ABCFR_ABCFRALMMACC1.pem"
         accountPublicKey = "./tests/resources/ABCFR_ABCFRALMMACC1.crt"
         brokerPublicKey = "./tests/resources/ecag-fixml-dev1.crt"
         self.options = Options(hostname, port, accountName, accountPublicKey, accountPrivateKey, brokerPublicKey, timeout=5)
 
     def test_broadcastReceiver(self):
-        broadcaster = Broadcaster(self.options.hostname, 35672, "admin", "admin", "broadcast", "broadcast.ABCFR.TradeConfirmation", 1)
+        broadcaster = Broadcaster(self.options.hostname, 5672, "admin", "admin", "broadcast", "broadcast.ABCFR.TradeConfirmation", 1)
         broadcaster.run()
 
         br = BroadcastReceiver(self.options)
@@ -31,7 +31,7 @@ def test_broadcastReceiver(self):
 
 
     def test_requestResponse(self):
-        responder = Responder(self.options.hostname, 35672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
+        responder = Responder(self.options.hostname, 5672, "admin", "admin", "request_be.ABCFR_ABCFRALMMACC1", 5)
         responder.start()
 
         rr = RequestResponse(self.options)
@@ -40,4 +40,4 @@ def test_requestResponse(self):
         self.assertGreaterEqual(rr.message_counter, 1)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()