[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  9c7ed1ea7c5fb4b6215324db883e2855c6112fb0 (commit)
      from  52022aa6dc8c4f16c47b79ce3cc4e6fcb8f92edf (commit)

Summary of changes:
 config/RtpConfigurator.py |   58 ++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 29 deletions(-)


- Log -----------------------------------------------------------------
commit 9c7ed1ea7c5fb4b6215324db883e2855c6112fb0
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Apr 12 12:07:07 2012 -0230

    Quick fixes to get this to run with recent module and file name changes.

diff --git a/config/RtpConfigurator.py b/config/RtpConfigurator.py
index a0f7ab7..8e04cb5 100755
--- a/config/RtpConfigurator.py
+++ b/config/RtpConfigurator.py
@@ -22,32 +22,32 @@
 import Ice, Configurator, sys, os
 
 # Load our component specific configuration definitions
-Ice.loadSlice("-I" + os.environ["ASTSCF_HOME"] + " -I" + Ice.getSliceDir() + " --all ../slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice")
-import AsteriskSCF.Configuration.MediaRTPPJMedia.V1
+Ice.loadSlice("-I" + os.environ["ASTSCF_HOME"] + " -I" + Ice.getSliceDir() + " --all ../slice/AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice")
+import AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1
 
 # Add our own visitor implementations for the sections we support
 class RtpSectionVisitors(Configurator.SectionVisitors):
     def visit_general(self, config, section):
-        group = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RtpGeneralGroup()
+        group = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.RTPGeneralGroup()
         group.configurationItems = { }
 
         mapper = Configurator.OptionMapper()
 
-        portsItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItem()
-        mapper.map('startport', portsItem, 'startPort', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItemName, config.getint, 10000)
-        mapper.map('endport', portsItem, 'endPort', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItemName, config.getint, 20000)
+        portsItem = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.PortRangesItem()
+        mapper.map('startport', portsItem, 'startPort', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.PortRangesItemName, config.getint, 10000)
+        mapper.map('endport', portsItem, 'endPort', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.PortRangesItemName, config.getint, 20000)
 
-        workerItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.WorkerThreadCountItem()
-        mapper.map('workerthreadcount', workerItem, 'count', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.WorkerThreadCountItemName, config.getint, 4)
+        workerItem = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.WorkerThreadCountItem()
+        mapper.map('workerthreadcount', workerItem, 'count', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.WorkerThreadCountItemName, config.getint, 4)
 
-        ipv4BindingItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv4Item()
-        mapper.map('ipv4bind', ipv4BindingItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv4AddressItemName, config.get, None)
+        ipv4BindingItem = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.BindingIPv4Item()
+        mapper.map('ipv4bind', ipv4BindingItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.BindingIPv4AddressItemName, config.get, None)
 
-        ipv6BindingItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv6Item()
-        mapper.map('ipv6bind', ipv6BindingItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv6AddressItemName, config.get, None)
+        ipv6BindingItem = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.BindingIPv6Item()
+        mapper.map('ipv6bind', ipv6BindingItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.BindingIPv6AddressItemName, config.get, None)
 
-        srtpEnableItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.EnableSRTPItem()
-        mapper.map('enablesrtp', srtpEnableItem, 'enabled', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.EnableSRTPItemName, config.get, True)
+        srtpEnableItem = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.EnableSRTPItem()
+        mapper.map('enablesrtp', srtpEnableItem, 'enabled', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.EnableSRTPItemName, config.get, True)
 
         for option in config.options(section):
             mapper.execute(group, section, option)
@@ -57,26 +57,26 @@ class RtpSectionVisitors(Configurator.SectionVisitors):
         self.groups.append(group)
 
     def visit_rtpoverice(self, config, section):
-        group = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RTPICEConfigurationGroup()
+        group = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.RTPICEConfigurationGroup()
         group.configurationItems = { }
 
         mapper = Configurator.OptionMapper()
 
-        stunServerItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.STUNServerItem()
-        mapper.map('stunserverhost', stunServerItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.STUNServerItemName, config.get, None)
-        mapper.map('stunserverport', stunServerItem, 'port', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.STUNServerItemName, config.getint, 3478)
+        stunServerItem = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.STUNServerItem()
+        mapper.map('stunserverhost', stunServerItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.STUNServerItemName, config.get, None)
+        mapper.map('stunserverport', stunServerItem, 'port', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.STUNServerItemName, config.getint, 3478)
         
-        turnServerItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.TURNServerItem()
-        mapper.map('turnserverhost', turnServerItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.TURNServerItemName, config.get, None)
-        mapper.map('turnserverport', turnServerItem, 'port', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.TURNServerItemName, config.getint, 3478)
+        turnServerItem = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.TURNServerItem()
+        mapper.map('turnserverhost', turnServerItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.TURNServerItemName, config.get, None)
+        mapper.map('turnserverport', turnServerItem, 'port', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.TURNServerItemName, config.getint, 3478)
 
-        rtpOverICEItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RTPICETransportFlagsItem()
-        mapper.map('rtpovericeenable', rtpOverICEItem, 'enableICE', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RTPICETransportFlagsItemName, config.get, None)
-        mapper.map('rtpovericewithturn', rtpOverICEItem, 'enableTURN', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RTPICETransportFlagsItemName, config.get, None)
+        rtpOverICEItem = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.RTPICETransportFlagsItem()
+        mapper.map('rtpovericeenable', rtpOverICEItem, 'enableICE', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.RTPICETransportFlagsItemName, config.get, None)
+        mapper.map('rtpovericewithturn', rtpOverICEItem, 'enableTURN', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.RTPICETransportFlagsItemName, config.get, None)
 
-        rtpICELimits = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RTPICETransportLimitsItem()
-        mapper.map('rtpicemaxcandidates', rtpICELimits, 'maxCandidates', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RTPICELimitsItemName, config.getint, 10)
-        mapper.map('rtpicemaxcalls', rtpICELimits, 'maxCalls', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RTPICELimitsItemName, config.getint, 50)
+        rtpICELimits = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.RTPICETransportLimitsItem()
+        mapper.map('rtpicemaxcandidates', rtpICELimits, 'maxCandidates', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.RTPICELimitsItemName, config.getint, 10)
+        mapper.map('rtpicemaxcalls', rtpICELimits, 'maxCalls', AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.RTPICELimitsItemName, config.getint, 50)
 
         for option in config.options(section):
             mapper.execute(group, section, option)
@@ -86,8 +86,8 @@ class RtpSectionVisitors(Configurator.SectionVisitors):
         self.groups.append(group)
 
 # In order to do service locator based lookup we need to pass in a params object
-serviceLocatorParams = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RtpConfigurationParams()
-serviceLocatorParams.category = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.ConfigurationDiscoveryCategory
+serviceLocatorParams = AsteriskSCF.Core.Discovery.V1.ServiceLocatorParams()
+serviceLocatorParams.category = AsteriskSCF.Configuration.MediaRTPPJMEDIA.V1.ConfigurationDiscoveryCategory
 
 # Make a configurator application and let it run
 app = Configurator.ConfiguratorApp('Rtp.config', RtpSectionVisitors(), None, serviceLocatorParams)

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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git