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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  0b68e05bf1bf1dd4d25587a6478cd275e8362811 (commit)
      from  b803dcb774ce77589ddf2763bf8dea7a0c09a0fa (commit)

Summary of changes:
 config/routingtest.conf |   46 +++++++++++++++++++++++-----------------------
 test/TestRouting.cpp    |    4 ++--
 2 files changed, 25 insertions(+), 25 deletions(-)


- Log -----------------------------------------------------------------
commit 0b68e05bf1bf1dd4d25587a6478cd275e8362811
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Dec 6 17:24:48 2011 -0330

    Modify unit tests to use loopback adapter.

diff --git a/config/routingtest.conf b/config/routingtest.conf
index 0d8a5a3..85ffd38 100644
--- a/config/routingtest.conf
+++ b/config/routingtest.conf
@@ -8,7 +8,7 @@ IceBox.InheritProperties=1
 Ice.ThreadPool.Client.Size=10
 
 IceBox.InstanceName=IceBox
-IceBox.ServiceManager.Endpoints=tcp -p 10007
+IceBox.ServiceManager.Endpoints=tcp -h 127.0.0.1 -p 10007
 
 IceBox.Service.ServiceDiscovery=service_locator:create
 IceBox.Service.RoutingService=BasicRoutingService:create
@@ -20,12 +20,12 @@ IceBox.Service.RoutingTest = RoutingTest:create --log_level=all
 
 IceBox.LoadOrder=ServiceDiscovery,Replicator,RoutingService,RoutingService2,RoutingTest
 
-LocatorService.Proxy=LocatorService:tcp -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1  -p 4411
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1  -p 4412
 
 # this is used to connect to the IceStorm instance that lives in the same IceBox
 # container as the ServiceDiscovery service
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -h 127.0.0.1  -p 4421
 
 # Category for the bridge service. This is used by the Routing test driver.
 BridgeManager.ServiceLocatorId=BridgeService
@@ -33,8 +33,8 @@ BridgeManager.ServiceLocatorId=BridgeService
 ###########################################
 # Routing Service properties
 
-RoutingService.ServiceAdapter.Endpoints=tcp -p 10050
-RoutingService.BackplaneAdapter.Endpoints=tcp -p 10051
+RoutingService.ServiceAdapter.Endpoints=tcp -h 127.0.0.1  -p 10050
+RoutingService.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1  -p 10051
 RoutingService.ServiceAdapter.ThreadPool.Size=8
 RoutingService.ServiceAdapter.ThreadPool.SizeMax=14
 RoutingService.ServiceAdapter.ThreadPool.SizeWarn=9
@@ -42,15 +42,15 @@ RoutingService.Standby=no
 RoutingService.StateReplicatorId=Replicator
 RoutingService.ComponentTest=yes
 
-RoutingService2.ServiceAdapter.Endpoints=tcp -p 10052
-RoutingService2.BackplaneAdapter.Endpoints=tcp -p 10053
+RoutingService2.ServiceAdapter.Endpoints=tcp -h 127.0.0.1  -p 10052
+RoutingService2.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1  -p 10053
 RoutingService2.ServiceAdapter.ThreadPool.Size=8
 RoutingService2.ServiceAdapter.ThreadPool.SizeMax=14
 RoutingService2.ServiceAdapter.ThreadPool.SizeWarn=9
 RoutingService2.Standby=yes
 RoutingService2.StateReplicatorId=Replicator
 
-Replicator.Adapter.Endpoints=default -p 10054
+Replicator.Adapter.Endpoints=default -h 127.0.0.1  -p 10054
 Replicator.Adapter.ThreadPool.Size=8
 Replicator.Adapter.ThreadPool.SizeMax=14
 Replicator.Adapter.ThreadPool.SizeWarn=9
@@ -59,24 +59,24 @@ Replicator.Adapter.ThreadPool.SizeWarn=9
 # Test properties
 
 # Test adapter
-TestRoutingAdapterOut.Endpoints=tcp -p 10070
-TestRoutingAdapterIn.Endpoints=tcp -p 10071
+TestRoutingAdapterOut.Endpoints=tcp -h 127.0.0.1  -p 10070
+TestRoutingAdapterIn.Endpoints=tcp -h 127.0.0.1  -p 10071
 
 # NOTE: For testing, we grab direct proxy to the same servant on 
 # backup service.
 
 # Where to look for the Routing Service LocatorRegistry interface
-LocatorRegistry.Proxy=RoutingServiceLocatorRegistry:tcp -p 10050
-BackupLocatorRegistry.Proxy=RoutingServiceLocatorRegistry:tcp -p 10052
+LocatorRegistry.Proxy=RoutingServiceLocatorRegistry:tcp -h 127.0.0.1  -p 10050
+BackupLocatorRegistry.Proxy=RoutingServiceLocatorRegistry:tcp -h 127.0.0.1  -p 10052
 
-SessionRouter.Proxy=SessionRouter:tcp -p 10050
-BackupSessionRouter.Proxy=SessionRouter:tcp -p 10052
+SessionRouter.Proxy=SessionRouter:tcp -h 127.0.0.1  -p 10050
+BackupSessionRouter.Proxy=SessionRouter:tcp -h 127.0.0.1  -p 10052
 
-Replica.Proxy=Replica:tcp -p 10051
-BackupReplica.Proxy=Replica:tcp -p 10053
+Replica.Proxy=Replica:tcp -h 127.0.0.1  -p 10051
+BackupReplica.Proxy=Replica:tcp -h 127.0.0.1  -p 10053
 
 # Proxy to the Component Service inteface
-RoutingComponent.Proxy=ComponentService:tcp -p 10051
+RoutingComponent.Proxy=ComponentService:tcp -h 127.0.0.1  -p 10051
 
 TestRoutingAdapterIn.ThreadPool.Size=8
 TestRoutingAdapterIn.ThreadPool.SizeMax=14
@@ -91,15 +91,15 @@ TestRoutingAdapterOut.ThreadPool.SizeWarn=9
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4422:udp -p 4422
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1  -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1  -p 4422:udp -h 127.0.0.1  -p 4422
 ServiceDiscovery.IceStorm.Trace.TopicManager=2
 ServiceDiscovery.IceStorm.Transient=1
 ServiceDiscovery.IceStorm.Flush.Timeout=2000
 
 # Test endpoints for the service locator management adapter
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
-ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1  -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1  -p 4411
+ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1  -p 4410
 ServiceDiscovery.Standalone=true
 
diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index 85dd2a6..a16fe36 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.cpp
@@ -71,7 +71,7 @@ struct GlobalIceFixture
             SharedTestData::instance.communicatorIn = IceBoxTestEnv.communicator;
 
             Ice::PropertiesPtr props = SharedTestData::instance.communicatorIn->getProperties();
-            SharedTestData::instance.adapterIn = SharedTestData::instance.communicatorIn->createObjectAdapterWithEndpoints("TestRoutingAdapterIn", "default -p 10070");
+            SharedTestData::instance.adapterIn = SharedTestData::instance.communicatorIn->createObjectAdapterWithEndpoints("TestRoutingAdapterIn", "default -h 127.0.0.1 -p 10070");
 
             // Serve up our own EndpointLocator, since we're emulating a channel.
             MockEndpointLocator *locator = new MockEndpointLocator();
@@ -89,7 +89,7 @@ struct GlobalIceFixture
             Ice::InitializationData initData;
             initData.properties = IceBoxTestEnv.communicator->getProperties();
             SharedTestData::instance.communicatorOut = Ice::initialize(initData);
-            SharedTestData::instance.adapterOut = SharedTestData::instance.communicatorOut->createObjectAdapterWithEndpoints("TestRoutingAdapterOut", "default -p 10071");
+            SharedTestData::instance.adapterOut = SharedTestData::instance.communicatorOut->createObjectAdapterWithEndpoints("TestRoutingAdapterOut", "default -h 127.0.0.1 -p 10071");
 
             // Get ref to Routing Service's ComponentService interface. 
             Ice::ObjectPrx componentObj = SharedTestData::instance.communicatorOut->propertyToProxy("RoutingComponent.Proxy");

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


-- 
asterisk-scf/release/routing.git