[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Jun 2 21:42:49 CDT 2011
branch "review" has been updated
via 87f131ca8e237a89fdda3b85aea859ac3f1e8c2d (commit)
from 0bf7de67e85b9639fa30cec1518119f2c0de49ee (commit)
Summary of changes:
plugins/asteriskscf_icebox.py | 38 +++++++++++++++-----------------------
remote.py | 4 ++--
2 files changed, 17 insertions(+), 25 deletions(-)
- Log -----------------------------------------------------------------
commit 87f131ca8e237a89fdda3b85aea859ac3f1e8c2d
Author: Darren Sessions <dsessions at digium.com>
Date: Thu Jun 2 21:42:45 2011 -0500
working on the ipv6 fix
diff --git a/plugins/asteriskscf_icebox.py b/plugins/asteriskscf_icebox.py
index 8dab939..564fa4b 100644
--- a/plugins/asteriskscf_icebox.py
+++ b/plugins/asteriskscf_icebox.py
@@ -48,19 +48,18 @@ class plugin(TestSuite.RemoteBaseClass):
return [
'IceBox.InheritProperties=1',
'IceBox.Service.ServiceDiscovery=service_locator:create',
- 'LocatorService.Proxy=LocatorService:tcp -p 4411',
- 'TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000',
'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',
- 'ServiceLocator.StateReplicator.Proxy=ServiceLocatorStateReplicatorService:tcp -p 4413',
- 'ServiceLocatorStateReplicatorListener=no',
- 'ServiceLocatorAdapter.Endpoints=tcp -p 4411',
+ 'ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422',
'ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412',
- 'ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422']
+ 'ServiceLocatorAdapter.Endpoints=tcp -p 4411',
+ 'LocatorService.Proxy=LocatorService:tcp -p 4411',
+ 'TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000',
+ 'LoggerAdapter.Endpoints=default']
elif component == 'logger_server':
return [
'IceBox.InheritProperties=1',
@@ -82,15 +81,13 @@ class plugin(TestSuite.RemoteBaseClass):
'Replicator.InstanceName=Replicator']
elif component == 'bridge':
return [
- 'IceBox.InheritProperties=1',
- 'IceBox.Service.BridgeManager=bridgeservice:create',
'Ice.ThreadPool.Client.Size=10',
- 'TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000',
+ 'BridgeManager.BridgeService.Endpoints=default',
+ 'ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422',
'LocatorService.Proxy=LocatorService:tcp -p 4411',
- 'ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422']
- #'BridgeManager.BridgeService.ThreadPool.Size=4',
- #'BridgeManager.BridgeServiceInternal.ThreadPool.Size=4',
- #'BridgeManager.BridgeService.Endpoints=default']
+ 'TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000',
+ 'IceBox.InheritProperties=1',
+ 'IceBox.Service.BridgeManager=bridgeservice:create']
elif component == 'routing_state_replicator':
return [
'Ice.ThreadPool.Client.Size=4',
@@ -108,15 +105,13 @@ class plugin(TestSuite.RemoteBaseClass):
elif component == 'routing':
return [
'Ice.ThreadPool.Client.Size=10',
- 'IceBox.InheritProperties=1',
'IceBox.Service.BasicRoutingService=BasicRoutingService:create',
+ 'IceBox.InheritProperties=1',
'BasicRoutingService.Endpoints=tcp -p 10050',
'BasicRoutingService.ComponentService.Endpoints=tcp -p 10051',
'BasicRoutingService.ThreadPool.Size=4',
'BasicRoutingService.ThreadPool.SizeMax=10',
'BasicRoutingService.ThreadPool.SizeWarn=9',
- #'BasicRoutingService.Standby=no',
- #'BasicRoutingService.StateReplicatorName=Replicator',
'LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422',
'LocatorService.Proxy=LocatorService:tcp -p 4411',
'TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000',
@@ -152,12 +147,10 @@ class plugin(TestSuite.RemoteBaseClass):
'TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000',
'LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422',
'LocatorService.Proxy=LocatorService:tcp -p 4411',
- 'Sip.RoutingId=testsuite',
'Sip.Modules=Session Logging',
'Sip.StateReplicatorName=default',
'Sip.StateReplicatorListener=no',
- 'Sip.Standalone=True',
- 'SipConfiguration.Name=testsuite']
+ 'Sip.Standalone=true']
elif component == 'rtp_state_replicator':
return [
'Ice.ThreadPool.Client.Size=4',
@@ -179,15 +172,14 @@ class plugin(TestSuite.RemoteBaseClass):
return [
'Ice.ThreadPool.Client.Size=10',
'IceBox.InheritProperties=1',
- 'IceBox.Service.MediaRTPpjmedia=media_rtp_pjmedia:create',
+ 'IceBox.Service.MediaRTPpjmedia=media_rtp_pjmedia:create',
'MediaRTPpjmediaAdapter.Endpoints=default',
- 'MediaRTPpjmediaAdapterLocal.Endpoints=default',
'MediaRTPpjmediaAdapterLogger.Endpoints=default',
- 'TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000',
+ 'MediaRTPpjmediaAdapterLocal.Endpoints=default',
'ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422',
'ServiceLocatorProxy=LocatorService:tcp -p 4411',
'LocatorService.Proxy=LocatorService:tcp -p 4411',
- 'RtpConfiguration.Name=testsuite']
+ 'TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000']
else:
return
diff --git a/remote.py b/remote.py
index 97993e5..8c156d2 100755
--- a/remote.py
+++ b/remote.py
@@ -277,10 +277,10 @@ def discoverIps():
return results
if plat == 'Linux':
return (tryToGetIP('ipv4',['ip','addr','show','%s' % iface], 'inet', ['sed','-e','/f/d','-e','s/ *inet *//g','-e','s/\/.*$//g']),
- tryToGetIP('ipv6',['ip','addr','show','%s' % iface], 'inet6', ['sed','-e','/fe80/d','-e','s/ *inet6 *//g','-e','s/\/64.*$//g']))
+ '[%s]' % tryToGetIP('ipv6',['ip','addr','show','%s' % iface], 'inet6', ['sed','-e','/fe80/d','-e','s/ *inet6 *//g','-e','s/\/64.*$//g']))
elif plat == 'Darwin':
return (tryToGetIP('ipv4',['ifconfig','%s' % iface], 'inet ', ['sed','-e','s/\t*inet *//g','-e','s/netmask.*$//g','-e','s/\ //g']),
- tryToGetIP('ipv6',['ifconfig','%s' % iface], 'inet6', ['sed','-e','/fe80/d','-e','s/\t *inet6 *//g','-e','s/prefixlen.*$//g','-e','s/\ //g']))
+ '[%s]' % tryToGetIP('ipv6',['ifconfig','%s' % iface], 'inet6', ['sed','-e','/fe80/d','-e','s/\t *inet6 *//g','-e','s/prefixlen.*$//g','-e','s/\ //g']))
else:
print 'This platform is currently not supported.'
sys.exit(1)
-----------------------------------------------------------------------
--
asterisk-scf/integration/testsuite.git
More information about the asterisk-scf-commits
mailing list