[asterisk-scf-commits] asterisk-scf/release/media_transport_udptl.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Dec 6 14:50:41 CST 2011
branch "master" has been updated
via 944a99d7b24d1d8a1ecd7b08a4adf6820582b383 (commit)
from f81a97fd1a98ad26cf04cf4a5a21b1a1061df926 (commit)
Summary of changes:
config/test_component.config | 30 ++++++++++++++++--------------
config/test_component_v6.config | 28 +++++++++++++++-------------
config/test_udptl_ice.conf | 30 ++++++++++++++++--------------
test/TestMediaTransportUDPTL.cpp | 4 ++--
test/TestUDPTLICE.cpp | 2 +-
5 files changed, 50 insertions(+), 44 deletions(-)
- Log -----------------------------------------------------------------
commit 944a99d7b24d1d8a1ecd7b08a4adf6820582b383
Author: Brent Eagles <beagles at digium.com>
Date: Tue Dec 6 17:20:07 2011 -0330
Modify all tests to use loopback adapter
diff --git a/config/test_component.config b/config/test_component.config
index 241a91c..bba9f35 100644
--- a/config/test_component.config
+++ b/config/test_component.config
@@ -13,13 +13,13 @@ Ice.Override.Timeout=5000
IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp:udp
+UdptlStateReplicator.Adapter.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 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
#
# MediaTransportUDPTL Configuration
@@ -28,9 +28,11 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
IceBox.Service.MediaTransportUDPTL=MediaTransportUDPTL:create
# Adapter parameters for this component
-MediaTransportUDPTLAdapter.Endpoints=default
-MediaTransportUDPTLAdapterLocal.Endpoints=default
-MediaTransportUDPTLAdapterLogger.Endpoints=default
+MediaTransportUDPTLAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLocal.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLogger.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.ServiceAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
#
# TestMediaTransportUDPTL Configuration
@@ -45,21 +47,21 @@ IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_test:create
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 10000
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 10001:udp -h 127.0.0.1 -p 10001
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -p 10006
+UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
UdptlStateReplicator.IceStorm.Trace.TopicManager=2
UdptlStateReplicator.IceStorm.Transient=1
UdptlStateReplicator.IceStorm.Flush.Timeout=2000
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
-ServiceDiscovery.BackplaneAdapter.Endpoints=default
+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=default -h 127.0.0.1
-LoggerAdapter.Endpoints=default
+LoggerAdapter.Endpoints=default -h 127.0.0.1
diff --git a/config/test_component_v6.config b/config/test_component_v6.config
index 89a8889..5b930d2 100644
--- a/config/test_component_v6.config
+++ b/config/test_component_v6.config
@@ -13,13 +13,13 @@ Ice.Override.Timeout=5000
IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp:udp
+UdptlStateReplicator.Adapter.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 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
#
# MediaTransportUDPTL Configuration
@@ -28,9 +28,11 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
IceBox.Service.MediaTransportUDPTL=MediaTransportUDPTL:create
# Adapter parameters for this component
-MediaTransportUDPTLAdapter.Endpoints=default
-MediaTransportUDPTLAdapterLocal.Endpoints=default
-MediaTransportUDPTLAdapterLogger.Endpoints=default
+MediaTransportUDPTLAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLocal.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLogger.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.ServiceAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
#
# TestMediaTransportUDPTL Configuration
@@ -45,20 +47,20 @@ IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_test_v6:create
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 10000
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 10001:udp -h 127.0.0.1 -p 10001
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -p 10006
+UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
UdptlStateReplicator.IceStorm.Trace.TopicManager=2
UdptlStateReplicator.IceStorm.Transient=1
UdptlStateReplicator.IceStorm.Flush.Timeout=2000
-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
-LoggerAdapter.Endpoints=default
+LoggerAdapter.Endpoints=default -h 127.0.0.1
diff --git a/config/test_udptl_ice.conf b/config/test_udptl_ice.conf
index 0d24c2f..9299405 100644
--- a/config/test_udptl_ice.conf
+++ b/config/test_udptl_ice.conf
@@ -15,13 +15,13 @@ Ice.Override.Timeout=5000
IceBox.Service.UdptlStateReplicator=UdptlStateReplicator:create
# Adapter parameters for this component
-UdptlStateReplicator.Adapter.Endpoints=tcp:udp
+UdptlStateReplicator.Adapter.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 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
#
# MediaTransportUDPTL Configuration
@@ -30,9 +30,11 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
IceBox.Service.MediaTransportUDPTL=MediaTransportUDPTL:create
# Adapter parameters for this component
-MediaTransportUDPTLAdapter.Endpoints=default
-MediaTransportUDPTLAdapterLocal.Endpoints=default
-MediaTransportUDPTLAdapterLogger.Endpoints=default
+MediaTransportUDPTLAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLocal.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTLAdapterLogger.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.ServiceAdapter.Endpoints=default -h 127.0.0.1
+MediaTransportUDPTL.BackplaneAdapter.Endpoints=default -h 127.0.0.1
#
# TestMediaTransportUDPTL Configuration
@@ -47,21 +49,21 @@ IceBox.Service.TestMediaTransportUDPTL=MediaTransportUDPTL_ice_test:create
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 10000
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10000
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 10001:udp -h 127.0.0.1 -p 10001
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
UdptlStateReplicator.IceStorm.InstanceName=UdptlStateReplicator
-UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -p 10005
-UdptlStateReplicator.IceStorm.Publish.Endpoints=default -p 10006
+UdptlStateReplicator.IceStorm.TopicManager.Endpoints=default -h 127.0.0.1 -p 10005
+UdptlStateReplicator.IceStorm.Publish.Endpoints=default -h 127.0.0.1 -p 10006
UdptlStateReplicator.IceStorm.Trace.TopicManager=2
UdptlStateReplicator.IceStorm.Transient=1
UdptlStateReplicator.IceStorm.Flush.Timeout=2000
-ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
-ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
-ServiceDiscovery.BackplaneAdapter.Endpoints=default
+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=default -h 127.0.0.1
-LoggerAdapter.Endpoints=default
+LoggerAdapter.Endpoints=default -h 127.0.0.1
diff --git a/test/TestMediaTransportUDPTL.cpp b/test/TestMediaTransportUDPTL.cpp
index 0b99136..4e6bba9 100644
--- a/test/TestMediaTransportUDPTL.cpp
+++ b/test/TestMediaTransportUDPTL.cpp
@@ -269,7 +269,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();
@@ -281,7 +281,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";
diff --git a/test/TestUDPTLICE.cpp b/test/TestUDPTLICE.cpp
index 402a55a..546d9a3 100644
--- a/test/TestUDPTLICE.cpp
+++ b/test/TestUDPTLICE.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.
-----------------------------------------------------------------------
--
asterisk-scf/release/media_transport_udptl.git
More information about the asterisk-scf-commits
mailing list