[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "configuration-replication" updated.

[Commits to the Asterisk SCF project code repositories]

branch "configuration-replication" has been updated
       via  5c696c9882975b9feb11c4ea2d535378e77bcd04 (commit)
      from  a7f1600075e5990bbecef9f273bf8cb0af77f444 (commit)

Summary of changes:
 config/SipConfigurator.py             |    6 +++++-
 config/test_sip_state_replicator.conf |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 5c696c9882975b9feb11c4ea2d535378e77bcd04
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue May 17 14:29:26 2011 -0300

    Add support for finding the configuration service using service locator.

diff --git a/config/SipConfigurator.py b/config/SipConfigurator.py
index d04f2ac..9d7ed3e 100755
--- a/config/SipConfigurator.py
+++ b/config/SipConfigurator.py
@@ -161,6 +161,10 @@ class SipSectionVisitors(Configurator.SectionVisitors):
         elif config.get(section, 'type') == 'endpoint':
             self.visit_endpoint(config, section)
 
+# In order to do service locator based lookup we need to pass in a params object
+serviceLocatorParams = AsteriskSCF.SIP.V1.SipConfigurationParams()
+serviceLocatorParams.category = AsteriskSCF.SIP.V1.ConfigurationDiscoveryCategory
+
 # Make a configurator application and let it run
-app = Configurator.ConfiguratorApp('Sip.config', SipSectionVisitors())
+app = Configurator.ConfiguratorApp('Sip.config', SipSectionVisitors(), None, serviceLocatorParams)
 sys.exit(app.main(sys.argv))
diff --git a/config/test_sip_state_replicator.conf b/config/test_sip_state_replicator.conf
index 0a35cda..e7e7c6f 100644
--- a/config/test_sip_state_replicator.conf
+++ b/config/test_sip_state_replicator.conf
@@ -23,4 +23,4 @@ SipStateReplicatorIceStorm.Publish.Endpoints=default -p 10008
 SipStateReplicatorIceStorm.Trace.TopicManager=2
 SipStateReplicatorIceStorm.Transient=1
 SipStateReplicatorIceStorm.Flush.Timeout=2000
-SipStateReplicatorTopicManager.Proxy=SipStateReplicatorIceStorm/TopicManager:default -p 10008
+SipStateReplicatorTopicManager.Proxy=SipStateReplicatorIceStorm/TopicManager:default -p 10007

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


-- 
asterisk-scf/integration/sip.git