[asterisk-scf-commits] asterisk-scf/release/testsuite.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue May 15 10:17:28 CDT 2012
branch "master" has been updated
via 45aae1456c7662e30d60e9a81e7f7e0081460b46 (commit)
via 595b9ad6d4ddfe9563fe6af60948a1ff89f89a1b (commit)
via 3195ba61cbad12959d5d58e8b48df8b4e0c5163c (commit)
from c0c527f31f2bf70fec7e3adda9911f8bedd070cd (commit)
Summary of changes:
configs/icebox/failover/SIPService.conf | 2 +-
configs/icebox/failover/SIPServiceActive.conf | 2 +-
configs/icebox/failover/SIPServiceStandby.conf | 2 +-
configs/icebox/standalone/SipService.conf | 2 +-
plugins/asteriskscf_activator.py | 2 +-
plugins/asteriskscf_configurator.py | 62 ++++++++++++------------
tests/asteriskscf/failover/sip/testcase.yaml | 4 +-
tests/build/asterisk_scf/testcase.yaml | 2 +-
8 files changed, 39 insertions(+), 39 deletions(-)
- Log -----------------------------------------------------------------
commit 45aae1456c7662e30d60e9a81e7f7e0081460b46
Author: Darren Sessions <dsessions at digium.com>
Date: Tue May 15 10:16:48 2012 -0500
Updated the configurator plugin, category replica names within testcases, and both failover and standby icebox configuration files in the testsuite for the sip component name transition from SIPSessionManager to SIPSessionGateway.
diff --git a/configs/icebox/failover/SIPService.conf b/configs/icebox/failover/SIPService.conf
index 5d6f7ec..cec9558 100644
--- a/configs/icebox/failover/SIPService.conf
+++ b/configs/icebox/failover/SIPService.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.SIPServiceActive=SIPSessionManager:create
+IceBox.Service.SIPServiceActive=SIPSessionGateway:create
SIPServiceActive.ServiceAdapter.Endpoints=tcp -p 4461
SIPServiceActive.ServiceAdapter.ThreadPool.Size=4
diff --git a/configs/icebox/failover/SIPServiceActive.conf b/configs/icebox/failover/SIPServiceActive.conf
index c1a8e9a..0fece5c 100644
--- a/configs/icebox/failover/SIPServiceActive.conf
+++ b/configs/icebox/failover/SIPServiceActive.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.SIPServiceActive=SIPSessionManager:create
+IceBox.Service.SIPServiceActive=SIPSessionGateway:create
SIPServiceActive.ServiceAdapter.Endpoints=tcp -p 4461 !!PUBLIC!!
SIPServiceActive.ServiceAdapter.ThreadPool.Size=4
diff --git a/configs/icebox/failover/SIPServiceStandby.conf b/configs/icebox/failover/SIPServiceStandby.conf
index 6a0be19..e643b69 100644
--- a/configs/icebox/failover/SIPServiceStandby.conf
+++ b/configs/icebox/failover/SIPServiceStandby.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.SIPServiceStandby=SIPSessionManager:create
+IceBox.Service.SIPServiceStandby=SIPSessionGateway:create
SIPServiceStandby.ServiceAdapter.Endpoints=tcp -p 4461 !!PUBLIC!!
SIPServiceStandby.ServiceAdapter.ThreadPool.Size=4
diff --git a/configs/icebox/standalone/SipService.conf b/configs/icebox/standalone/SipService.conf
index 87f6450..bdb5c60 100644
--- a/configs/icebox/standalone/SipService.conf
+++ b/configs/icebox/standalone/SipService.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.SIPService=SIPSessionManager:create
+IceBox.Service.SIPService=SIPSessionGateway:create
SIPService.ServiceAdapter.Endpoints=tcp -p 4461
SIPService.ServiceAdapter.ThreadPool.Size=4
diff --git a/plugins/asteriskscf_configurator.py b/plugins/asteriskscf_configurator.py
index 146e07c..179b6b1 100644
--- a/plugins/asteriskscf_configurator.py
+++ b/plugins/asteriskscf_configurator.py
@@ -51,7 +51,7 @@ class plugin(Plugin.BaseClass):
Ice.loadSlice("-I\"" + gitall + "\" -I\"" + Ice.getSliceDir() + "\" --all \"" + AstSCFslice + "System/OperationsIf.ice\"")
Ice.loadSlice("-I\"" + gitall + "\" -I\"" + Ice.getSliceDir() + "\" -I\"" + slice + "\" --all \"" + AstSCFslice + "System/Component/ConfigurationIf.ice\"")
Ice.loadSlice("-I\"" + slice + "\" -I\"" + Ice.getSliceDir() + "\" --all \"" + AstSCFslice + "Core/Discovery/ServiceLocatorIf.ice\"")
- Ice.loadSlice("-I\"" + slice + "\" -I\"" + Ice.getSliceDir() + "\" --all \"" + gitall + "sip/slice/AsteriskSCF/Configuration/SIPSessionManager/SIPConfigurationIf.ice\"")
+ Ice.loadSlice("-I\"" + slice + "\" -I\"" + Ice.getSliceDir() + "\" --all \"" + gitall + "sip/slice/AsteriskSCF/Configuration/SIPSessionGateway/SIPConfigurationIf.ice\"")
Ice.loadSlice("-I\"" + slice + "\" -I\"" + Ice.getSliceDir() + "\" --all \"" + gitall + "media_rtp_pjmedia/slice/AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice\"")
except:
@@ -61,7 +61,7 @@ class plugin(Plugin.BaseClass):
import AsteriskSCF.System.V1
import AsteriskSCF.System.Configuration.V1
import AsteriskSCF.Core.Discovery.V1
- import AsteriskSCF.Configuration.SIPSessionManager.V1
+ import AsteriskSCF.Configuration.SIPSessionGateway.V1
import AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1
except:
return {'success':False,'shutdownExempt':'True','msg':'Unable to import required Asterisk SCF python modules.'}
@@ -70,7 +70,7 @@ class plugin(Plugin.BaseClass):
for cmd in testData['cmd']:
if cmd == 'sip':
serviceLocatorParams = AsteriskSCF.Core.Discovery.V1.ServiceLocatorParams()
- serviceLocatorParams.category = AsteriskSCF.Configuration.SIPSessionManager.V1.ConfigurationDiscoveryCategory
+ serviceLocatorParams.category = AsteriskSCF.Configuration.SIPSessionGateway.V1.ConfigurationDiscoveryCategory
serviceLocatorParams.service = 'default'
elif cmd == 'rtp':
serviceLocatorParams = AsteriskSCF.Core.Discovery.V1.ServiceLocatorParams()
@@ -278,7 +278,7 @@ class SectionVisitors(Misc.Utils):
class SIPSectionVisitors(SectionVisitors):
def visit_general(self, config, section):
- group = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPGeneralGroup()
+ group = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPGeneralGroup()
group.configurationItems = {}
self.groups.append(group)
return {'success':True}
@@ -288,12 +288,12 @@ class SIPSectionVisitors(SectionVisitors):
if remote['success'] == False:
return remote
- group = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPUDPTransportGroup()
+ group = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPUDPTransportGroup()
group.name = section
group.configurationItems = {}
mapper = OptionMapper()
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPHostItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPHostItem()
mapper.map('host', item, 'host', 'address', remote['host'], None)
mapper.map('port', item, 'port', 'address', remote['port'], 5060)
for option in config:
@@ -310,12 +310,12 @@ class SIPSectionVisitors(SectionVisitors):
if remote['success'] == False:
return remote
- group = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPTCPTransportGroup()
+ group = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPTCPTransportGroup()
group.name = section
group.configurationItems = {}
mapper = OptionMapper()
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPHostItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPHostItem()
mapper.map('host', item, 'host', 'address', remote['host'], None)
mapper.map('port', item, 'port', 'address', remote['port'], 5060)
for option in config.options(section):
@@ -334,12 +334,12 @@ class SIPSectionVisitors(SectionVisitors):
if remote['success'] == False:
return remote
- group = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPTLSTransportGroup()
+ group = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPTLSTransportGroup()
group.name = section
group.configurationItems = {}
mapper = OptionMapper()
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPHostItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPHostItem()
mapper.map('host', item, 'host', 'address', remote['host'], None)
mapper.map('port', item, 'port', 'address', remote['port'], 5060)
for option in config.options(section):
@@ -354,26 +354,26 @@ class SIPSectionVisitors(SectionVisitors):
return {'success':True}
def visit_endpoint(self, config, section):
- group = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPEndpointGroup()
+ group = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPEndpointGroup()
group.name = section
group.configurationItems = {}
mapper = OptionMapper()
- mapper.map('routing', self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPRoutingItem(), 'routingServiceName', 'routingService', config.get, None)
+ mapper.map('routing', self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPRoutingItem(), 'routingServiceName', 'routingService', config.get, None)
remote = self.getRemoteHost(section, config, hostLabel='sourcehost', portLabel='sourceport')
if remote['success'] == False:
return remote
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPSourceTransportAddressItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPSourceTransportAddressItem()
mapper.map('sourcehost', item, 'host', 'sourceaddress', remote['sourcehost'], None)
mapper.map('sourceport', item, 'port', 'sourceaddress', remote['sourceport'], 5060)
remote = self.getRemoteHost(section, config, hostLabel='targethost', portLabel='targetport')
if remote['success'] == False:
return remote
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPTargetDestinationAddressItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPTargetDestinationAddressItem()
mapper.map('targethost', item, 'host', 'targetaddress', remote['targethost'], None)
mapper.map('targetport', item, 'port', 'targetaddress', remote['targetport'], 5060)
@@ -381,49 +381,49 @@ class SIPSectionVisitors(SectionVisitors):
def get(self, option, AsteriskSCF):
if option:
if option == 'inbound':
- return AsteriskSCF.Configuration.SIPSessionManager.V1.SIPAllowableCallDirection.Inbound
+ return AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPAllowableCallDirection.Inbound
elif option == 'outbound':
- return AsteriskSCF.Configuration.SIPSessionManager.V1.SIPAllowableCallDirection.Outbound
+ return AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPAllowableCallDirection.Outbound
elif option == 'both':
- return AsteriskSCF.Configuration.SIPSessionManager.V1.SIPAllowableCallDirection.Both
+ return AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPAllowableCallDirection.Both
elif option == 'none':
- return AsteriskSCF.Configuration.SIPSessionManager.V1.SIPAllowableCallDirection.Disabled
+ return AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPAllowableCallDirection.Disabled
return AsteriskSCF.SIP.V1.SIPAllowableCallDirection.Both
transformer = AllowableCallDirectionTransformer()
- mapper.map('direction', self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPAllowableCallDirectionItem(), 'callDirection', 'callDirection', transformer.get(self.chkOption(config, 'direction'), self.AsteriskSCF), None)
- mapper.map('securetransport', self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPEndpointTransportItem(), 'secureTransport', 'transport', transformer.get(self.chkOption(config, 'securetransport'), self.AsteriskSCF), None)
+ mapper.map('direction', self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPAllowableCallDirectionItem(), 'callDirection', 'callDirection', transformer.get(self.chkOption(config, 'direction'), self.AsteriskSCF), None)
+ mapper.map('securetransport', self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPEndpointTransportItem(), 'secureTransport', 'transport', transformer.get(self.chkOption(config, 'securetransport'), self.AsteriskSCF), None)
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPRTPMediaServiceItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPRTPMediaServiceItem()
mapper.map('rtpoveripv6', item, 'requireIPv6', 'mediaservice', self.chkOption(config, 'rtpoveripv6'), None)
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPCryptoCertificateItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPCryptoCertificateItem()
mapper.map('certificateauthorityfile', item, 'certificateAuthority', 'cryptocert', self.chkOption(config, 'certificateauthorityfile'), None)
mapper.map('certificatefile', item, 'certificate', 'cryptocert', self.chkOption(config, 'certificatefile'), None)
mapper.map('privatekeyfile', item, 'privateKey', 'cryptocert', self.chkOption(config, 'privatekeyfile'), None)
mapper.map('privatekeypassword', item, 'privateKeyPassword', 'cryptocert', self.chkOption(config, 'privatekeypassword'), None)
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPCryptoRequirementsItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPCryptoRequirementsItem()
mapper.map('requireverifiedserver', item, 'requireVerifiedServer', 'cryptorequirements', self.chkOption(config, 'requireverifiedserver'), None)
mapper.map('requireverifiedclient', item, 'requireVerifiedClient', 'cryptorequirements', self.chkOption(config, 'requireverifiedclient'), None)
mapper.map('requireclientcertificate', item, 'requireClientCertificate', 'cryptorequirements', self.chkOption(config, 'requireclientcertificate'), None)
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPCryptoItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPCryptoItem()
mapper.map('supportedciphers', item, 'supportedCiphers', 'crypto', self.chkOption(config, 'supportedciphers'), None)
mapper.map('tlsservername', item, 'serverName', 'crypto', self.chkOption(config, 'tlsservername'), None)
mapper.map('tlstimeout', item, 'timeout', 'crypto', self.chkOption(config, 'tlstimeout'), None)
if self.chkOption(config, 'tlsprotocolmethod') == 'tlsv1':
- tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODTLSV1
+ tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.TLSProtocolMethod.PROTOCOLMETHODTLSV1
elif self.chkOption(config, 'tlsprotocolmethod') == 'sslv2':
- tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODTSSLV2
+ tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.TLSProtocolMethod.PROTOCOLMETHODTSSLV2
elif self.chkOption(config, 'tlsprotocolmethod') == 'sslv3':
- tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODSSLV3
+ tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.TLSProtocolMethod.PROTOCOLMETHODSSLV3
elif self.chkOption(config, 'tlsprotocolmethod') == 'sslv23':
- tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODSSLV23
+ tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.TLSProtocolMethod.PROTOCOLMETHODSSLV23
else:
- tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODUNSPECIFIED
+ tlsprotocolmethod = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.TLSProtocolMethod.PROTOCOLMETHODUNSPECIFIED
mapper.map('tlsprotocolmethod', item, 'protocolMethod', 'crypto', tlsprotocolmethod, None)
@@ -441,7 +441,7 @@ class SIPSectionVisitors(SectionVisitors):
sampleRate, found, rest = rest.partition('@')
frameSize, found, formatSpecific = rest.partition(';')
- item = self.AsteriskSCF.Configuration.SIPSessionManager.V1.SIPMediaFormatItem()
+ item = self.AsteriskSCF.Configuration.SIPSessionGateway.V1.SIPMediaFormatItem()
item.name = name
if sampleRate:
item.sampleRate = sampleRate
diff --git a/tests/asteriskscf/failover/sip/testcase.yaml b/tests/asteriskscf/failover/sip/testcase.yaml
index 13ca672..a14b54d 100644
--- a/tests/asteriskscf/failover/sip/testcase.yaml
+++ b/tests/asteriskscf/failover/sip/testcase.yaml
@@ -55,7 +55,7 @@ tests :
service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
cmd :
activate :
- replica_name : SIPSessionManager.Replica
+ replica_name : SIPSessionGateway.Replica
instance_id : SIPServiceActive
service_name : default
- asteriskscf_configurator :
@@ -126,7 +126,7 @@ tests :
service_locator_host : [testsuite-remote-1.digium.internal, public1, ipv4]
cmd :
activate :
- replica_name : SIPSessionManager.Replica
+ replica_name : SIPSessionGateway.Replica
instance_id : SIPServiceStandby
service_name : default
- sipp:
commit 595b9ad6d4ddfe9563fe6af60948a1ff89f89a1b
Author: Darren Sessions <dsessions at digium.com>
Date: Tue May 15 09:37:04 2012 -0500
We want to make sure we are pulling fresh code every time.
diff --git a/tests/build/asterisk_scf/testcase.yaml b/tests/build/asterisk_scf/testcase.yaml
index 9f8e0b4..d0b9d1f 100644
--- a/tests/build/asterisk_scf/testcase.yaml
+++ b/tests/build/asterisk_scf/testcase.yaml
@@ -56,7 +56,7 @@ tests :
- build :
remote_agent : [galway.digium.internal, public1, ipv4]
cmd :
- pull_update : True
+ pull_update : False
dl_type : git
dl_url : 'git://git.asterisk.org/asterisk-scf/integration/gitall'
cd : gitall
commit 3195ba61cbad12959d5d58e8b48df8b4e0c5163c
Author: Darren Sessions <dsessions at digium.com>
Date: Tue May 15 09:33:52 2012 -0500
Updated the activator and configurator plugins to not use a hardcoded path for the gitall directory. This is nessesary as bamboo clones the code from the repo in potentially different directories on the fs based on the name of the bamboo project and plan.
diff --git a/plugins/asteriskscf_activator.py b/plugins/asteriskscf_activator.py
index 05c3983..73c2418 100644
--- a/plugins/asteriskscf_activator.py
+++ b/plugins/asteriskscf_activator.py
@@ -32,7 +32,7 @@ class plugin(Plugin.BaseClass):
def main(self, testData):
time.sleep(1)
try:
- gitall = "/usr/local/testsuite/tmp/gitall/"
+ gitall = "%s/tmp/gitall/" % os.getcwd()
slice = gitall + "slice/slice"
AstSCFslice = slice + "/AsteriskSCF/"
diff --git a/plugins/asteriskscf_configurator.py b/plugins/asteriskscf_configurator.py
index f98927f..146e07c 100644
--- a/plugins/asteriskscf_configurator.py
+++ b/plugins/asteriskscf_configurator.py
@@ -44,7 +44,7 @@ class plugin(Plugin.BaseClass):
testData['configuration_wipe'] = None
try:
- gitall = "/usr/local/testsuite/tmp/gitall/"
+ gitall = "%s/tmp/gitall/" % os.getcwd()
slice = gitall + "slice/slice"
AstSCFslice = slice + "/AsteriskSCF/"
-----------------------------------------------------------------------
--
asterisk-scf/release/testsuite.git
More information about the asterisk-scf-commits
mailing list