[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.

[Commits to the Asterisk SCF project code repositories]

branch "review" has been updated
       via  fc6231918030786fcb376751b1316e53d716a749 (commit)
      from  9cbe7bbbd1c72901b77df54fc693e05c8caefa00 (commit)

Summary of changes:
 plugins/asteriskscf_configurator.py |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit fc6231918030786fcb376751b1316e53d716a749
Author: Darren Sessions <dsessions at digium.com>
Date:   Thu Jun 2 23:10:52 2011 -0500

    tweaks

diff --git a/plugins/asteriskscf_configurator.py b/plugins/asteriskscf_configurator.py
index 3c4cb71..1d54b25 100644
--- a/plugins/asteriskscf_configurator.py
+++ b/plugins/asteriskscf_configurator.py
@@ -50,6 +50,7 @@ class plugin(TestSuite.BaseClass):
             else:
                 return {'success':False,'shutdownExempt':'True','msg':'The %s command is invalid.' % cmd}
             results = ConfiguratorApp(cmd, testData['service_locator_host'], testData['cmd'][cmd], AsteriskSCF, testData['configuration_wipe'], serviceLocatorParams).main([''])
+            print >> sys.stderr, results
             if results['success'] == False:
                 return {'success':False, 'shutdownExempt':'True', 'msg':results['msg']}
 
@@ -331,22 +332,22 @@ class SipSectionVisitors(SectionVisitors):
         mapper.map('targetport', item, 'port', 'targetaddress', remote['targetport'], 5060)
 
         class AllowableCallDirectionTransformer():
-            def get(self, option):
+            def get(self, option, AsteriskSCF):
                 if option:
                     if option == 'inbound':
-                        return self.AsteriskSCF.SIP.V1.SipAllowableCallDirection.Inbound
+                        return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Inbound
                     elif option == 'outbound':
-                        return self.AsteriskSCF.SIP.V1.SipAllowableCallDirection.Outbound
+                        return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Outbound
                     elif option == 'both':
-                        return self.AsteriskSCF.SIP.V1.SipAllowableCallDirection.Both
-                return self.AsteriskSCF.SIP.V1.SipAllowableCallDirection.Both
+                        return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Both
+                return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Both
 
         transformer = AllowableCallDirectionTransformer()
 
-        mapper.map('direction', self.AsteriskSCF.SIP.V1.SipAllowableCallDirectionItem(), 'callDirection', 'callDirection', transformer.get(self.chkOption(config, 'direction')), None)
-        mapper.map('securetransport', AsteriskSCF.SIP.V1.SipEndpointTransportItem(), 'secureTransport', 'transport', transformer.get(self.chkOption(config, 'securetransport')), None)
+        mapper.map('direction', self.AsteriskSCF.SIP.V1.SipAllowableCallDirectionItem(), 'callDirection', 'callDirection', transformer.get(self.chkOption(config, 'direction', self.AsteriskSCF)), None)
+        mapper.map('securetransport', self.AsteriskSCF.SIP.V1.SipEndpointTransportItem(), 'secureTransport', 'transport', transformer.get(self.chkOption(config, 'securetransport', self.AsteriskSCF)), None)
 
-        item = AsteriskSCF.SIP.V1.SipRTPMediaServiceItem()
+        item = self.AsteriskSCF.SIP.V1.SipRTPMediaServiceItem()
         mapper.map('rtpoveripv6', item, 'requireIPv6', 'mediaservice', self.chkOption(config, 'rtpoveripv6'), None)
 
         item = self.AsteriskSCF.SIP.V1.SipCryptoCertificateItem()

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/testsuite.git