[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  f3fc03f25cf923dd3e1f264bd2f9797f5fa08b4a (commit)
      from  7a865ca109654e97c88c15ed4e6bebf0f3b6a1b9 (commit)

Summary of changes:
 config/test_bridging.conf |   31 ++++++++++++++++---------------
 test/TestBridging.cpp     |    2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)


- Log -----------------------------------------------------------------
commit f3fc03f25cf923dd3e1f264bd2f9797f5fa08b4a
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Dec 6 16:40:52 2011 -0330

    Convert all unit tests to use loopback address instead of all adapters.

diff --git a/config/test_bridging.conf b/config/test_bridging.conf
index a2c794d..5ec14f2 100644
--- a/config/test_bridging.conf
+++ b/config/test_bridging.conf
@@ -25,19 +25,19 @@ Ice.ThreadPool.Client.Size=4
 ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
 ServiceDiscovery.IceStorm.TopicManager.ThreadPool.Size=4
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 10001:udp -h 127.0.0.1 -p 10001
 ServiceDiscovery.IceStorm.Publish.ThreadPool.Size=4
 ServiceDiscovery.IceStorm.Transient=1
 ServiceDiscovery.IceStorm.Trace.TopicManager=0
 ServiceDiscovery.IceStorm.Flush.Timeout=2000
-TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -h 127.0.0.1 -p 4421
 
-ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4422
+ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1 -p 4410
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4422
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4422
 
 LoggerAdapter.Endpoints=default
 Logger.ServiceAdapter.Endpoints=default
@@ -66,6 +66,7 @@ IceBox.Service.TestDriver=bridge_component_test:create
 # service discovery in a later branch.
 #
 TestChannel.InstanceName=BridgeTest
+TestChannel.TestChannel.Endpoints=default -h 127.0.0.1
 
 #
 # Configuration for the test bridge instances. There are are two: one master
@@ -76,18 +77,18 @@ TestChannel.InstanceName=BridgeTest
 #
 TestBridge.InstanceName=TestBridge
 TestBridge.BridgeManagerObjectId=TestBridgeManager
-TestBridge.ServiceAdapter.Endpoints=default -p 57000
-TestBridge.ServiceAdapter.ThreadPool.Size=4
-TestBridge.BackplaneAdapter.Endpoints=default -p 57001
-TestBridge.BackplaneAdapter.ThreadPool.Size=4
+TestBridge.ServiceAdapter.Endpoints=default -h 127.0.0.1 -p 57000
+TestBridge.ServiceAdapter.ThreadPool.Size=2
+TestBridge.BackplaneAdapter.Endpoints=default -h 127.0.0.1 -p 57001
+TestBridge.BackplaneAdapter.ThreadPool.Size=2
 TestBridge.Standby=false
 
 TestBridge2.InstanceName=TestBridge2
 TestBridge2.BridgeManagerObjectId=TestBridgeManager2
 TestBridge2.Standby=true
-TestBridge2.ServiceAdapter.Endpoints=default -p 57010
+TestBridge2.ServiceAdapter.Endpoints=default -h 127.0.0.1 -p 57010
 TestBridge2.ServiceAdapter.ThreadPool.Size=4
-TestBridge2.BackplaneAdapter.Endpoints=default -p 57011
+TestBridge2.BackplaneAdapter.Endpoints=default -h 127.0.0.1 -p 57011
 TestBridge2.BackplaneAdapter.ThreadPool.Size=4
 
 #
@@ -111,6 +112,6 @@ IceBox.LoadOrder=ServiceDiscovery Logger Replicator TestBridge TestBridge2 TestC
 # Configuring a manager endpoint for the IceBox service allows services to be managed and
 # monitored.
 #
-IceBox.ServiceManager.Endpoints=default -p 56000
+IceBox.ServiceManager.Endpoints=default -h 127.0.0.1 -p 56000
 IceBox.ServiceManager.ThreadPool.Size=4
-IceBoxMgr.Proxy=IceBox/ServiceManager:default -p 56000
+IceBoxMgr.Proxy=IceBox/ServiceManager:default -h 127.0.0.1 -p 56000
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 0476241..7ae58f4 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -221,7 +221,7 @@ public:
         Ice::PropertiesPtr props = mCommunicator->getProperties();
         propGetSet(props, "TestUtilAdapter.ThreadPool.Size", "4");
         propGetSet(props, "TestUtilAdapter.ThreadPool.Size", "4");
-        propGetSet(props, "TestUtilAdapter.Endpoints", "default");
+        propGetSet(props, "TestUtilAdapter.Endpoints", "default -h 127.0.0.1");
         lookupProxies();
     }
 

-----------------------------------------------------------------------


-- 
asterisk-scf/release/bridging.git