[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 Sep 20 16:02:19 CDT 2011
branch "master" has been updated
via 79856c7897e1d9552c43e7d368b7c7f0268e3f3d (commit)
from e8bce571fe3f100190ecdb614af33aba32baa504 (commit)
Summary of changes:
config/test_component.conf | 38 +++++++++++++++++++-------------------
config/test_component_v6.conf | 38 +++++++++++++++++++-------------------
config/test_rtp_ice.conf | 35 ++++++++++++++---------------------
3 files changed, 52 insertions(+), 59 deletions(-)
- Log -----------------------------------------------------------------
commit 79856c7897e1d9552c43e7d368b7c7f0268e3f3d
Author: Ken Hunt <ken.hunt at digium.com>
Date: Tue Sep 20 16:01:47 2011 -0500
Updated the unit test config files for the recent config changes.
diff --git a/config/test_component.conf b/config/test_component.conf
index b0c6d4f..8489207 100644
--- a/config/test_component.conf
+++ b/config/test_component.conf
@@ -15,17 +15,18 @@ Ice.Override.Timeout=5000
IceBox.Service.ServiceDiscovery=service_locator:create
-AsteriskSCFIceStorm.InstanceName=AsteriskSCFIceStorm
-AsteriskSCFIceStorm.TopicManager.Endpoints=tcp -p 4421
-AsteriskSCFIceStorm.Publish.Endpoints=tcp -p 4423
-AsteriskSCFIceStorm.Trace.TopicManager=2
-AsteriskSCFIceStorm.Transient=1
-AsteriskSCFIceStorm.Flush.Timeout=2000
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:tcp -p 4421
-
-ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
-ServiceLocatorAdapter.Endpoints=tcp -p 4411
-ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
+
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.Trace.TopicManager=2
+ServiceDiscovery.IceStorm.Transient=1
+ServiceDiscovery.IceStorm.Flush.Timeout=2000
+
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
#
# RtpStateReplicator Configuration
@@ -36,13 +37,12 @@ IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
RtpStateReplicator.Adapter.Endpoints=tcp:udp
# IceStorm parameters for the RTP state replicator
-RtpStateReplicatorIceStorm.InstanceName=RtpStateReplicatorIceStorm
-RtpStateReplicatorIceStorm.TopicManager.Endpoints=default -p 10005
-RtpStateReplicatorIceStorm.Publish.Endpoints=default -p 10006
-RtpStateReplicatorIceStorm.Trace.TopicManager=2
-RtpStateReplicatorIceStorm.Transient=1
-RtpStateReplicatorIceStorm.Flush.Timeout=2000
-RtpStateReplicatorTopicManager.Proxy=RtpStateReplicatorIceStorm/TopicManager:default -p 10005
+RtpStateReplicator.IceStorm.InstanceName=RtpStateReplicator
+RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10007
+RtpStateReplicator.IceStorm.Publish.Endpoints=default -p 10008
+RtpStateReplicator.IceStorm.Trace.TopicManager=2
+RtpStateReplicator.IceStorm.Transient=1
+RtpStateReplicator.IceStorm.Flush.Timeout=2000
#
# media_rtp_pjmedia Configuration
@@ -58,7 +58,7 @@ MediaServiceRTP.ServiceAdapter.Endpoints=tcp -p 4471
MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -p 4472
# A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
# A proxy to the service locator service
LocatorService.Proxy=LocatorService:tcp -p 4411
diff --git a/config/test_component_v6.conf b/config/test_component_v6.conf
index 31a76e5..c64742f 100644
--- a/config/test_component_v6.conf
+++ b/config/test_component_v6.conf
@@ -15,17 +15,18 @@ Ice.Override.Timeout=5000
IceBox.Service.ServiceDiscovery=service_locator:create
-AsteriskSCFIceStorm.InstanceName=AsteriskSCFIceStorm
-AsteriskSCFIceStorm.TopicManager.Endpoints=tcp -p 4421
-AsteriskSCFIceStorm.Publish.Endpoints=tcp -p 4423
-AsteriskSCFIceStorm.Trace.TopicManager=2
-AsteriskSCFIceStorm.Transient=1
-AsteriskSCFIceStorm.Flush.Timeout=2000
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:tcp -p 4421
-
-ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
-ServiceLocatorAdapter.Endpoints=tcp -p 4411
-ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
+
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.Trace.TopicManager=2
+ServiceDiscovery.IceStorm.Transient=1
+ServiceDiscovery.IceStorm.Flush.Timeout=2000
+
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
#
# RtpStateReplicator Configuration
@@ -36,13 +37,12 @@ IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
RtpStateReplicator.Adapter.Endpoints=tcp:udp
# IceStorm parameters for the RTP state replicator
-RtpStateReplicatorIceStorm.InstanceName=RtpStateReplicatorIceStorm
-RtpStateReplicatorIceStorm.TopicManager.Endpoints=default -p 10005
-RtpStateReplicatorIceStorm.Publish.Endpoints=default -p 10006
-RtpStateReplicatorIceStorm.Trace.TopicManager=2
-RtpStateReplicatorIceStorm.Transient=1
-RtpStateReplicatorIceStorm.Flush.Timeout=2000
-RtpStateReplicatorTopicManager.Proxy=RtpStateReplicatorIceStorm/TopicManager:default -p 10005
+RtpStateReplicator.IceStorm.InstanceName=RtpStateReplicator
+RtpStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10007
+RtpStateReplicator.IceStorm.Publish.Endpoints=default -p 10008
+RtpStateReplicator.IceStorm.Trace.TopicManager=2
+RtpStateReplicator.IceStorm.Transient=1
+RtpStateReplicator.IceStorm.Flush.Timeout=2000
#
# media_rtp_pjmedia Configuration
@@ -58,7 +58,7 @@ MediaServiceRTP.ServiceAdapter.Endpoints=tcp -p 4471
MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -p 4472
# A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
# A proxy to the service locator service
LocatorService.Proxy=LocatorService:tcp -p 4411
diff --git a/config/test_rtp_ice.conf b/config/test_rtp_ice.conf
index f672a04..a2ce988 100644
--- a/config/test_rtp_ice.conf
+++ b/config/test_rtp_ice.conf
@@ -47,28 +47,21 @@ IceBox.Service.MediaRTPpjmediaTest=media_rtp_pjmedia_ice_test:create
IceBox.Service.ServiceDiscovery=service_locator:create
-AsteriskSCFIceStorm.InstanceName=AsteriskSCFIceStorm
-AsteriskSCFIceStorm.TopicManager.Endpoints=default -p 10000
-AsteriskSCFIceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
-AsteriskSCFIceStorm.Trace.TopicManager=2
-AsteriskSCFIceStorm.Transient=1
-AsteriskSCFIceStorm.Flush.Timeout=2000
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
-
-#RtpStateReplicatorIceStorm.InstanceName=RtpStateReplicatorIceStorm
-#RtpStateReplicatorIceStorm.TopicManager.Endpoints=default -p 10005
-#RtpStateReplicatorIceStorm.Publish.Endpoints=default -p 10006
-#RtpStateReplicatorIceStorm.Trace.TopicManager=2
-#RtpStateReplicatorIceStorm.Transient=1
-#RtpStateReplicatorIceStorm.Flush.Timeout=2000
-#RtpStateReplicatorTopicManager.Proxy=RtpStateReplicatorIceStorm/TopicManager:default -p 10005
-
-ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
-ServiceLocatorAdapter.Endpoints=tcp -p 4411
-ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
+
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.Trace.TopicManager=2
+ServiceDiscovery.IceStorm.Transient=1
+ServiceDiscovery.IceStorm.Flush.Timeout=2000
+
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 4421
+
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
LocatorService.Proxy=LocatorService:tcp -p 4411
-LoggerAdapter.Endpoints=default
Ice.ThreadPool.Client.Size=6
Ice.ThreadPool.Server.Size=6
-Rtp.Standalone=true
-----------------------------------------------------------------------
--
asterisk-scf/release/media_rtp_pjmedia.git
More information about the asterisk-scf-commits
mailing list