[asterisk-scf-commits] asterisk-scf/release/media_rtp_pjmedia.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Dec 6 14:35:24 CST 2011
branch "master" has been updated
via 03e3f186e97546590f9dab77f637f68edcc10b48 (commit)
from 6fef5dec075436182ff4ed713ae3622e1202d109 (commit)
Summary of changes:
config/test_component.conf | 24 ++++++++++++------------
config/test_component_v6.conf | 24 ++++++++++++------------
config/test_rtp_ice.conf | 30 +++++++++++++++---------------
test/TestRTPICE.cpp | 2 +-
test/TestRTPpjmedia.cpp | 4 ++--
5 files changed, 42 insertions(+), 42 deletions(-)
- Log -----------------------------------------------------------------
commit 03e3f186e97546590f9dab77f637f68edcc10b48
Author: Brent Eagles <beagles at digium.com>
Date: Tue Dec 6 17:04:46 2011 -0330
Modify all unit tests to use the loopback adapter.
diff --git a/config/test_component.conf b/config/test_component.conf
index 8489207..838db61 100644
--- a/config/test_component.conf
+++ b/config/test_component.conf
@@ -17,16 +17,16 @@ IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -h 127.0.0.1 -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4423
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -h 127.0.0.1 -p 4421
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
#
# RtpStateReplicator Configuration
@@ -34,12 +34,12 @@ ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
# Adapter parameters for this component
-RtpStateReplicator.Adapter.Endpoints=tcp:udp
+RtpStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
# IceStorm parameters for the RTP state replicator
RtpStateReplicator.IceStorm.InstanceName=RtpStateReplicator
-RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10007
-RtpStateReplicator.IceStorm.Publish.Endpoints=default -p 10008
+RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10007
+RtpStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10008
RtpStateReplicator.IceStorm.Trace.TopicManager=2
RtpStateReplicator.IceStorm.Transient=1
RtpStateReplicator.IceStorm.Flush.Timeout=2000
@@ -54,14 +54,14 @@ IceBox.Service.MediaServiceRTP=media_rtp_pjmedia:create
MediaServiceRTP.ServiceName=test
# Adapter parameters for this component
-MediaServiceRTP.ServiceAdapter.Endpoints=tcp -p 4471
-MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -p 4472
+MediaServiceRTP.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4471
+MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1 -p 4472
# A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
# A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
#
# media_rtp_pjmedia_test Configuration
diff --git a/config/test_component_v6.conf b/config/test_component_v6.conf
index c64742f..fb51bf3 100644
--- a/config/test_component_v6.conf
+++ b/config/test_component_v6.conf
@@ -17,16 +17,16 @@ IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -h 127.0.0.1 -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4423
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -h 127.0.0.1 -p 4421
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
#
# RtpStateReplicator Configuration
@@ -34,12 +34,12 @@ ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
# Adapter parameters for this component
-RtpStateReplicator.Adapter.Endpoints=tcp:udp
+RtpStateReplicator.Adapter.Endpoints=tcp -h 127.0.0.1:udp -h 127.0.0.1
# IceStorm parameters for the RTP state replicator
RtpStateReplicator.IceStorm.InstanceName=RtpStateReplicator
-RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10007
-RtpStateReplicator.IceStorm.Publish.Endpoints=default -p 10008
+RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10007
+RtpStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10008
RtpStateReplicator.IceStorm.Trace.TopicManager=2
RtpStateReplicator.IceStorm.Transient=1
RtpStateReplicator.IceStorm.Flush.Timeout=2000
@@ -54,14 +54,14 @@ IceBox.Service.MediaServiceRTP=media_rtp_pjmedia:create
MediaServiceRTP.ServiceName=test
# Adapter parameters for this component
-MediaServiceRTP.ServiceAdapter.Endpoints=tcp -p 4471
-MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -p 4472
+MediaServiceRTP.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4471
+MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -h 127.0.0.1 -p 4472
# A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
# A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
#
# media_rtp_pjmedia_test Configuration
diff --git a/config/test_rtp_ice.conf b/config/test_rtp_ice.conf
index a2ce988..6bed933 100644
--- a/config/test_rtp_ice.conf
+++ b/config/test_rtp_ice.conf
@@ -10,13 +10,13 @@ IceBox.LoadOrder=ServiceDiscovery,MediaRTPpjmedia,MediaRTPpjmediaTest
# RtpStateReplicator Configuration
# Adapter parameters for this component
-RtpStateReplicator.Endpoints=tcp:udp
+RtpStateReplicator.Endpoints=tcp -h 127.0.0.1 :udp -h 127.0.0.1
# A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4422
# A proxy to the service locator service
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
#
# media_rtp_pjmedia Configuration
@@ -25,15 +25,15 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
IceBox.Service.MediaRTPpjmedia=media_rtp_pjmedia:create
# Adapter parameters for this component
-MediaRTPpjmediaAdapter.Endpoints=default
-MediaRTPpjmediaAdapterLocal.Endpoints=default
-MediaRTPpjmediaAdapterLogger.Endpoints=default
+MediaRTPpjmediaAdapter.Endpoints=default -h 127.0.0.1
+MediaRTPpjmediaAdapterLocal.Endpoints=default -h 127.0.0.1
+MediaRTPpjmediaAdapterLogger.Endpoints=default -h 127.0.0.1
# A proxy to the service locator management service
-ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422
+ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4422
# A proxy to the service locator service
-ServiceLocatorProxy=LocatorService:tcp -p 4411
+ServiceLocatorProxy=LocatorService:tcp -h 127.0.0.1 -p 4411
#
# media_rtp_pjmedia_test Configuration
@@ -49,19 +49,19 @@ IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -h 127.0.0.1 -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4423
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
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.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -h 127.0.0.1 -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
Ice.ThreadPool.Client.Size=6
Ice.ThreadPool.Server.Size=6
diff --git a/test/TestRTPICE.cpp b/test/TestRTPICE.cpp
index e5d23c8..03f6745 100644
--- a/test/TestRTPICE.cpp
+++ b/test/TestRTPICE.cpp
@@ -75,7 +75,7 @@ public:
Ice::InitializationData data;
data.properties = IceBoxTestEnv.communicator->getProperties();
mCommunicator = Ice::initialize(IceBoxTestEnv.argc, IceBoxTestEnv.argv, data);
- mAdapter = mCommunicator->createObjectAdapterWithEndpoints("TestAdapter", "default");
+ mAdapter = mCommunicator->createObjectAdapterWithEndpoints("TestAdapter", "default -h 127.0.0.1");
//
// We will be making calls on proxies instantiated on this adapter, so we should activated here.
diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index ab4a68f..5228a42 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -307,7 +307,7 @@ struct GlobalIceFixture
{
Testbed.communicator = Ice::initialize(mCachedArgs.argc, mCachedArgs.argv);
- Testbed.adapter = Testbed.communicator->createObjectAdapterWithEndpoints("Adapter", "default");
+ Testbed.adapter = Testbed.communicator->createObjectAdapterWithEndpoints("Adapter", "default -h 127.0.0.1");
StreamSinkPtr sink = new TestStreamSink();
@@ -324,7 +324,7 @@ struct GlobalIceFixture
Testbed.adapter->activate();
- Testbed.locator = ServiceLocatorPrx::checkedCast(Testbed.communicator->stringToProxy("LocatorService:tcp -p 4411"));
+ Testbed.locator = ServiceLocatorPrx::checkedCast(Testbed.communicator->stringToProxy("LocatorService:tcp -h 127.0.0.1 -p 4411"));
if (!Testbed.locator) {
throw "Invalid service locator proxy";
-----------------------------------------------------------------------
--
asterisk-scf/release/media_rtp_pjmedia.git
More information about the asterisk-scf-commits
mailing list