[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
Wed Jul 20 09:48:40 CDT 2011


branch "review" has been updated
       via  489fbe913b6d79b1b5d24530289267d05f012268 (commit)
       via  3e64a17f8878765ae6c756242c94cf12e2481643 (commit)
       via  2da83ae635cfbff1977f24e78ca43bceebf70949 (commit)
       via  f703183920ec2df1a0290b842b01a5c8ef88c2ec (commit)
       via  86ed0187f6c46fc0c5eae765c355c9d05b4d08d6 (commit)
       via  09e213c9098d97c966587d0c3d2ca806adbd9d8a (commit)
      from  c4e33bf6a032263f7804a86de4fe7caf3a2f4f12 (commit)

Summary of changes:
 events/shutdown.yaml                               |    4 +
 events/startup.yaml                                |    4 +
 plugins/asteriskscf_configurator.py                |  122 ++--
 plugins/build.py                                   |    2 +-
 .../scenarios/call_then_attended_transfer.xml      |   24 +-
 .../scenarios/wait_for_call_do_hangup.xml          |   18 +-
 .../sip/Functional_Attended_Transfer/testcase.yaml |  805 +++++++++++++++++++-
 .../scenarios/call_then_blind_transfer.xml         |   17 +-
 .../scenarios/wait_for_call_do_hangup.xml          |   16 +-
 .../sip/Functional_Blind_Transfer/testcase.yaml    |  805 +++++++++++++++++++-
 .../Functional_Busy_Endpoint/scenarios/call.xml    |    1 -
 .../sip/Functional_Busy_Endpoint/testcase.yaml     |   60 +-
 .../Functional_Congestion_Endpoint/testcase.yaml   |   60 +-
 .../sip/Functional_Simple_Endpoint/testcase.yaml   |   66 +-
 .../sip/Functional_Timeout_Endpoint/testcase.yaml  |   60 +-
 .../testcase.yaml                                  |   13 +-
 .../testcase.yaml                                  |    4 +
 .../testcase.yaml                                  |   52 ++-
 18 files changed, 1961 insertions(+), 172 deletions(-)


- Log -----------------------------------------------------------------
commit 489fbe913b6d79b1b5d24530289267d05f012268
Author: Darren Sessions <dsessions at digium.com>
Date:   Wed Jul 20 09:48:25 2011 -0500

    Updated tests to incorporate media format option in configurator and new style icebox config.

diff --git a/tests/asterisk_scf_components/sip/Functional_Busy_Endpoint/scenarios/call.xml b/tests/asterisk_scf_components/sip/Functional_Busy_Endpoint/scenarios/call.xml
index 20c2824..737b996 100644
--- a/tests/asterisk_scf_components/sip/Functional_Busy_Endpoint/scenarios/call.xml
+++ b/tests/asterisk_scf_components/sip/Functional_Busy_Endpoint/scenarios/call.xml
@@ -13,7 +13,6 @@
       CSeq: 1 INVITE
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
-      Subject: Performance Test
       Content-Type: application/sdp
       Content-Length: [len]
 
diff --git a/tests/asterisk_scf_components/sip/Functional_Busy_Endpoint/testcase.yaml b/tests/asterisk_scf_components/sip/Functional_Busy_Endpoint/testcase.yaml
index 4a40562..dd0b191 100644
--- a/tests/asterisk_scf_components/sip/Functional_Busy_Endpoint/testcase.yaml
+++ b/tests/asterisk_scf_components/sip/Functional_Busy_Endpoint/testcase.yaml
@@ -29,11 +29,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -54,6 +57,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -64,6 +68,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -115,11 +120,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -145,6 +153,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -155,6 +164,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -206,11 +216,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -236,6 +249,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -246,6 +260,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -297,11 +312,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -322,6 +340,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -332,6 +351,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
diff --git a/tests/asterisk_scf_components/sip/Functional_Congestion_Endpoint/testcase.yaml b/tests/asterisk_scf_components/sip/Functional_Congestion_Endpoint/testcase.yaml
index cb28080..f54de49 100644
--- a/tests/asterisk_scf_components/sip/Functional_Congestion_Endpoint/testcase.yaml
+++ b/tests/asterisk_scf_components/sip/Functional_Congestion_Endpoint/testcase.yaml
@@ -29,11 +29,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -54,6 +57,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -64,6 +68,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -115,11 +120,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -145,6 +153,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -155,6 +164,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -206,11 +216,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -236,6 +249,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -246,6 +260,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -297,11 +312,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -322,6 +340,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -332,6 +351,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
diff --git a/tests/asterisk_scf_components/sip/Functional_Simple_Endpoint/testcase.yaml b/tests/asterisk_scf_components/sip/Functional_Simple_Endpoint/testcase.yaml
index 996aec5..3ad89eb 100644
--- a/tests/asterisk_scf_components/sip/Functional_Simple_Endpoint/testcase.yaml
+++ b/tests/asterisk_scf_components/sip/Functional_Simple_Endpoint/testcase.yaml
@@ -5,7 +5,7 @@ docs :
     summary : Test simple call setup using a SIPp UAC <> Asterisk SCF <> SIPp UAS scenario.
     description : 'This test starts Asterisk SCF on a test-suite remote agent and uses the configurator to push a configuration for two endpoints to the Asterisk SCF SIP Session Gateway on that remote.{br}{br}Two SIPp processes are then started on separate test-suite remote agents. One test-suite remote agent uses the SIPp embedded UAC scenario, and the other uses the SIPp embedded UAS scenario.{br}{br}A call is sent from the SIPp UAC to Asterisk SCF with the expectation that it will forward the call to the second SIPp process running as a UAS.{br}{br}This test case is comprised of several sub-tests that include various transport configurations including: ipv4 <> ipv4, ipv4 <> ipv6, ipv6 <> ipv4, and ipv6 <> ipv6.'
     repo_url : 'http://git.asterisk.org/gitweb/?p=asterisk-scf/release/testsuite.git;a=tree;f=bamboo;hb=HEAD'
-    components : 'Service Locator, Bridge, Routing, Sip Session Gateway, and Media_RTP_PJMedia'
+    components : 'Service Locator, Bridge, Routing, Sip Session Gateway, Media_RTP_PJMedia, and Media Format Generic'
     requirements : 'Asterisk SCF, SIPp, Wireshark (optional), CallFlow (optional)'
     list_test : ipv4toipv4
 tests :
@@ -13,7 +13,6 @@ tests :
         expected_failure : False 
         timeline:
             - wireshark :
-                doc_desc : 'Executes dumpcap (from Wireshark) using a host matrix filter to capture only specific types of packets from specific hosts.'
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start:
@@ -31,11 +30,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -56,6 +58,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -66,6 +69,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -115,12 +119,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - logger_server
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -141,6 +147,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -151,6 +158,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -200,12 +208,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - logger_server
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -231,6 +241,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -241,6 +252,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -290,12 +302,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - logger_server
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -321,6 +335,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -331,6 +346,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
diff --git a/tests/asterisk_scf_components/sip/Functional_Timeout_Endpoint/testcase.yaml b/tests/asterisk_scf_components/sip/Functional_Timeout_Endpoint/testcase.yaml
index 6215194..2324b16 100644
--- a/tests/asterisk_scf_components/sip/Functional_Timeout_Endpoint/testcase.yaml
+++ b/tests/asterisk_scf_components/sip/Functional_Timeout_Endpoint/testcase.yaml
@@ -29,11 +29,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -54,6 +57,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -64,6 +68,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -115,11 +120,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -145,6 +153,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -155,6 +164,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -206,11 +216,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -236,6 +249,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -246,6 +260,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -297,11 +312,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -322,6 +340,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                         - sipp :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -332,6 +351,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : True
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001

commit 3e64a17f8878765ae6c756242c94cf12e2481643
Author: Darren Sessions <dsessions at digium.com>
Date:   Mon Jul 18 16:17:36 2011 -0500

    made a slight tweak to the scf build test to always wipe the build dir before building.

diff --git a/tests/build/Build_and_Distribute_Asterisk_SCF_to_TestSuite_Remotes/testcase.yaml b/tests/build/Build_and_Distribute_Asterisk_SCF_to_TestSuite_Remotes/testcase.yaml
index aa0a1a8..89c39bd 100644
--- a/tests/build/Build_and_Distribute_Asterisk_SCF_to_TestSuite_Remotes/testcase.yaml
+++ b/tests/build/Build_and_Distribute_Asterisk_SCF_to_TestSuite_Remotes/testcase.yaml
@@ -61,6 +61,7 @@ tests :
                     cd : gitall
                     make_cmd :
                         - ./gitall-asterisk-scf.sh
+                        - rm -rf build
                         - cmake/init-cmake.sh
                         - cmake --build ./build
                     redistribute :

commit 2da83ae635cfbff1977f24e78ca43bceebf70949
Author: Darren Sessions <dsessions at digium.com>
Date:   Mon Jul 18 09:54:12 2011 -0500

    fixed the scratch build run command in the build plugin so fresh ice, asterisk scf, etc builds from scratch actually built.

diff --git a/plugins/build.py b/plugins/build.py
index fcc0ba3..127ef62 100644
--- a/plugins/build.py
+++ b/plugins/build.py
@@ -52,7 +52,7 @@ class plugin(TestSuite.RemoteBaseClass):
             results = remote['rpc']('removeDir', repoInfo['repoName'])
             if results['success'] == False:
                 return results
-            results = self._scratchBuild(remote['rpc'], remote['hostname'], repoInfo['repoName'], repoInfo['repoType'], repoInfo['repoGetCmd'], testData['cmd']['repo'])
+            results = self._scratchBuild(remote['rpc'], remote['hostname'], globalVars, repoInfo['repoName'], repoInfo['repoType'], repoInfo['repoGetCmd'], testData['cmd']['repo'])
             if results['success'] == False:
                 return results
 

commit f703183920ec2df1a0290b842b01a5c8ef88c2ec
Author: Darren Sessions <dsessions at digium.com>
Date:   Mon Jul 18 09:52:37 2011 -0500

    updated the configurator plugin within the test-suite to include modifications to both the AsteriskSCF ice function names as well as new options such as media format.

diff --git a/plugins/asteriskscf_configurator.py b/plugins/asteriskscf_configurator.py
index b370b63..38f43da 100644
--- a/plugins/asteriskscf_configurator.py
+++ b/plugins/asteriskscf_configurator.py
@@ -14,7 +14,7 @@ import sys
 import time
 import TestSuite
 
-sys.path.append('/opt/Ice-3.4.1/python')
+sys.path.append('/opt/Ice-3.4.2/python')
 
 import Ice
 
@@ -34,34 +34,37 @@ class plugin(TestSuite.BaseClass):
             testData['configuration_wipe'] = None
 
         try:
-            Ice.loadSlice('-I. --all ./tmp/gitall/slice/AsteriskSCF/System/Component/ConfigurationIf.ice')
-            Ice.loadSlice('-I. -I/opt/Ice-3.4.1/slice --all ./tmp/gitall/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice')
-            Ice.loadSlice('-I. -I/opt/Ice-3.4.1/slice -I./tmp/gitall/slice --all ./tmp/gitall/sip/local-slice/SipConfigurationIf.ice')
-            Ice.loadSlice('-I. -I/opt/Ice-3.4.1/slice -I./tmp/gitall/slice --all ./tmp/gitall/media_rtp_pjmedia/local-slice/RtpConfigurationIf.ice')
+            Ice.loadSlice('--all ./tmp/gitall/slice/slice/AsteriskSCF/System/Component/ConfigurationIf.ice')
+            Ice.loadSlice('-I' + Ice.getSliceDir() + ' --all ./tmp/gitall/slice/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice')
+            Ice.loadSlice('-I' + Ice.getSliceDir() + ' -I./tmp/gitall/slice/slice --all ./tmp/gitall/sip/slice/AsteriskSCF/Configuration/SipSessionManager/SipConfigurationIf.ice')
+            Ice.loadSlice('-I' + Ice.getSliceDir() + ' -I./tmp/gitall/slice/slice --all ./tmp/gitall/media_rtp_pjmedia/slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice')
         except:
             return {'success':False,'shutdownExempt':'True','msg':'Slice preprocessing failed. Unable to locate slice files.'}
 
         try:
             import AsteriskSCF.System.Configuration.V1
             import AsteriskSCF.Core.Discovery.V1
-            import AsteriskSCF.SIP.V1
-            import AsteriskSCF.Media.RTP.V1
+            import AsteriskSCF.Configuration.SipSessionManager.V1
+            import AsteriskSCF.Configuration.MediaRTPPJMedia.V1
         except:
             return {'success':False,'shutdownExempt':'True','msg':'Unable to import required Asterisk SCF python modules.'}
 
         ''' The configurator doesn't implement a start or stop function as it's just pushing config '''
         for cmd in testData['cmd']:
             if cmd == 'sip':
-                serviceLocatorParams = AsteriskSCF.SIP.V1.SipConfigurationParams()
-                serviceLocatorParams.category = AsteriskSCF.SIP.V1.ConfigurationDiscoveryCategory
+                serviceLocatorParams = AsteriskSCF.Configuration.SipSessionManager.V1.SipConfigurationParams()
+                serviceLocatorParams.category = AsteriskSCF.Configuration.SipSessionManager.V1.ConfigurationDiscoveryCategory
             elif cmd == 'rtp':
-                serviceLocatorParams = AsteriskSCF.Media.RTP.V1.RtpConfigurationParams()
-                serviceLocatorParams.category = AsteriskSCF.Media.RTP.V1.ConfigurationDiscoveryCategory
+                serviceLocatorParams = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RtpConfigurationParams()
+                serviceLocatorParams.category = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.ConfigurationDiscoveryCategory
             else:
                 return {'success':False,'shutdownExempt':'True','msg':'The %s command is invalid.' % cmd}
+
             results = ConfiguratorApp(globalVars, cmd, testData['service_locator_host'], testData['cmd'][cmd], AsteriskSCF, testData['configuration_wipe'], serviceLocatorParams).main([''])
+    
             if 'msg' in results:
                 results['msg'] = "['%s' component] %s" % (cmd, results['msg'])
+
             if results['success'] == False:
                 return {'success':False, 'shutdownExempt':'True', 'msg':results['msg']}
 
@@ -150,9 +153,9 @@ class ConfiguratorApp(Ice.Application):
         visitor.globalVars = self.globalVars
         visitor.AsteriskSCF = self.AsteriskSCF
        
-        proxy = 'LocatorService:tcp -p 4411 -h %s' % self.host
+        locator = 'LocatorService:tcp -p 4411 -h %s' % self.host
         configurationServiceName = ""
-        serviceLocator = self.AsteriskSCF.Core.Discovery.V1.ServiceLocatorPrx.checkedCast(self.communicator().stringToProxy(proxy))
+        serviceLocator = self.AsteriskSCF.Core.Discovery.V1.ServiceLocatorPrx.checkedCast(self.communicator().stringToProxy(locator))
 
         if serviceLocator:
             # Populate params with the name
@@ -244,7 +247,7 @@ class SectionVisitors():
 
 class SipSectionVisitors(SectionVisitors):
     def visit_general(self, config, section):
-        group = self.AsteriskSCF.SIP.V1.SipGeneralGroup()
+        group = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipGeneralGroup()
         group.configurationItems = {}
         self.groups.append(group)
         return {'success':True}
@@ -254,12 +257,12 @@ class SipSectionVisitors(SectionVisitors):
         if remote['success'] == False:
             return remote
 
-        group = self.AsteriskSCF.SIP.V1.SipUDPTransportGroup()
+        group = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipUDPTransportGroup()
         group.name = section
         group.configurationItems = {}
 
         mapper = OptionMapper()
-        item = self.AsteriskSCF.SIP.V1.SipHostItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipHostItem()
         mapper.map('host', item, 'host', 'address', remote['host'], None)
         mapper.map('port', item, 'port', 'address', remote['port'], 5060)
         for option in config:
@@ -278,12 +281,12 @@ class SipSectionVisitors(SectionVisitors):
         if remote['success'] == False:
             return remote
 
-        group = self.AsteriskSCF.SIP.V1.SipTCPTransportGroup()
+        group = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipTCPTransportGroup()
         group.name = section
         group.configurationItems = {}
 
         mapper = OptionMapper()
-        item = self.AsteriskSCF.SIP.V1.SipHostItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.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):
@@ -302,12 +305,12 @@ class SipSectionVisitors(SectionVisitors):
         if remote['success'] == False:
             return remote
 
-        group = self.AsteriskSCF.SIP.V1.SipTLSTransportGroup()
+        group = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipTLSTransportGroup()
         group.name = section
         group.configurationItems = {}
 
         mapper = OptionMapper()
-        item = self.AsteriskSCF.SIP.V1.SipHostItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.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):
@@ -322,25 +325,25 @@ class SipSectionVisitors(SectionVisitors):
         return {'success':True}
 
     def visit_endpoint(self, config, section):
-        group = self.AsteriskSCF.SIP.V1.SipEndpointGroup()
+        group = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipEndpointGroup()
         group.name = section
         group.configurationItems = {}
 
         mapper = OptionMapper()
 
-        mapper.map('routing', self.AsteriskSCF.SIP.V1.SipRoutingItem(), 'routingServiceName', 'routingService', config.get, None)
+        mapper.map('routing', self.AsteriskSCF.Configuration.SipSessionManager.V1.SipRoutingItem(), 'routingServiceName', 'routingService', config.get, None)
 
         remote = self.getRemoteHost(self.globalVars, section, config, 'sourcehost', 'sourceport')
         if remote['success'] == False:
             return remote
-        item = self.AsteriskSCF.SIP.V1.SipSourceTransportAddressItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipSourceTransportAddressItem()
         mapper.map('sourcehost', item, 'host', 'sourceaddress', remote['sourcehost'], None)
         mapper.map('sourceport', item, 'port', 'sourceaddress', remote['sourceport'], 5060)
 
         remote = self.getRemoteHost(self.globalVars, section, config, 'targethost', 'targetport')
         if remote['success'] == False:
             return remote
-        item = self.AsteriskSCF.SIP.V1.SipTargetDestinationAddressItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipTargetDestinationAddressItem()
         mapper.map('targethost', item, 'host', 'targetaddress', remote['targethost'], None)
         mapper.map('targetport', item, 'port', 'targetaddress', remote['targetport'], 5060)
 
@@ -348,49 +351,49 @@ class SipSectionVisitors(SectionVisitors):
             def get(self, option, AsteriskSCF):
                 if option:
                     if option == 'inbound':
-                        return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Inbound
+                        return AsteriskSCF.Configuration.SipSessionManager.V1.SipAllowableCallDirection.Inbound
                     elif option == 'outbound':
-                        return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Outbound
+                        return AsteriskSCF.Configuration.SipSessionManager.V1.SipAllowableCallDirection.Outbound
                     elif option == 'both':
-                        return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Both
+                        return AsteriskSCF.Configuration.SipSessionManager.V1.SipAllowableCallDirection.Both
                     elif option == 'none':
-                        return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Disabled
+                        return AsteriskSCF.Configuration.SipSessionManager.V1.SipAllowableCallDirection.Disabled
                 return AsteriskSCF.SIP.V1.SipAllowableCallDirection.Both
 
         transformer = AllowableCallDirectionTransformer()
 
-        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)
+        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)
 
-        item = self.AsteriskSCF.SIP.V1.SipRTPMediaServiceItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipRTPMediaServiceItem()
         mapper.map('rtpoveripv6', item, 'requireIPv6', 'mediaservice', self.chkOption(config, 'rtpoveripv6'), None)
 
-        item = self.AsteriskSCF.SIP.V1.SipCryptoCertificateItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.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.SIP.V1.SipCryptoRequirementsItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.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.SIP.V1.SipCryptoItem()
+        item = self.AsteriskSCF.Configuration.SipSessionManager.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.SIP.V1.TLSProtocolMethod.PROTOCOLMETHODTLSV1
+            tlsprotocolmethod = self.AsteriskSCF.Configuration.SipSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODTLSV1
         elif self.chkOption(config, 'tlsprotocolmethod') == 'sslv2':
-            tlsprotocolmethod = self.AsteriskSCF.SIP.V1.TLSProtocolMethod.PROTOCOLMETHODTSSLV2
+            tlsprotocolmethod = self.AsteriskSCF.Configuration.SipSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODTSSLV2
         elif self.chkOption(config, 'tlsprotocolmethod') == 'sslv3':
-            tlsprotocolmethod =  self.AsteriskSCF.SIP.V1.TLSProtocolMethod.PROTOCOLMETHODSSLV3
+            tlsprotocolmethod =  self.AsteriskSCF.Configuration.SipSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODSSLV3
         elif self.chkOption(config, 'tlsprotocolmethod') == 'sslv23':
-            tlsprotocolmethod = self.AsteriskSCF.SIP.V1.TLSProtocolMethod.PROTOCOLMETHODSSLV23
+            tlsprotocolmethod = self.AsteriskSCF.Configuration.SipSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODSSLV23
         else:
-            tlsprotocolmethod = self.AsteriskSCF.SIP.V1.TLSProtocolMethod.PROTOCOLMETHODUNSPECIFIED
+            tlsprotocolmethod = self.AsteriskSCF.Configuration.SipSessionManager.V1.TLSProtocolMethod.PROTOCOLMETHODUNSPECIFIED
 
         mapper.map('tlsprotocolmethod', item, 'protocolMethod', 'crypto', tlsprotocolmethod, None)
 
@@ -400,6 +403,28 @@ class SipSectionVisitors(SectionVisitors):
             mapper.execute(group, section, option)
 
         mapper.finish(group)
+
+        if 'formats' in config:
+            try:
+                for format in config['formats'].split(','):
+                    name, found, rest = format.partition('/')
+                    sampleRate, found, rest = rest.partition('@')
+                    frameSize, found, formatSpecific = rest.partition(';')
+ 
+                    item = self.AsteriskSCF.Configuration.SipSessionManager.V1.SipMediaFormatItem()
+                    item.name = name
+                    if sampleRate:
+                        item.sampleRate = sampleRate
+                    if frameSize:
+                        item.frameSize = frameSize
+                    item.formatSpecific = []
+                    if formatSpecific:
+                        item.formatSpecific.append(formatSpecific)
+
+                    group.configurationItems[format] = item
+            except:
+                pass
+
         self.groups.append(group)
 
         return {'success':True}
@@ -416,17 +441,23 @@ class SipSectionVisitors(SectionVisitors):
 
 class RtpSectionVisitors(SectionVisitors):
     def visit_general(self, config, section):
-        group = self.AsteriskSCF.Media.RTP.V1.RtpGeneralGroup()
+        group = self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RtpGeneralGroup()
         group.configurationItems = {}
 
         mapper = OptionMapper()
 
-        portsItem = self.AsteriskSCF.Media.RTP.V1.PortRangesItem()
-        mapper.map('startport', portsItem, 'startPort', self.AsteriskSCF.Media.RTP.V1.PortRangesItemName, self.chkOption(config, 'startport'), 10000)
-        mapper.map('endport', portsItem, 'endPort', self.AsteriskSCF.Media.RTP.V1.PortRangesItemName, self.chkOption(config, 'endport'), 20000)
+        portsItem = self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItem()
+        mapper.map('startport', portsItem, 'startPort', self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItemName, self.chkOption(config, 'startport'), 10000)
+        mapper.map('endport', portsItem, 'endPort', self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItemName, self.chkOption(config, 'endport'), 20000)
 
-        workerItem = self.AsteriskSCF.Media.RTP.V1.WorkerThreadCountItem()
-        mapper.map('workerthreadcount', workerItem, 'count', self.AsteriskSCF.Media.RTP.V1.WorkerThreadCountItemName, self.chkOption(config, 'workerthreadcount'), 4)
+        workerItem = self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.WorkerThreadCountItem()
+        mapper.map('workerthreadcount', workerItem, 'count', self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.WorkerThreadCountItemName, self.chkOption(config, 'workerthreadcount'), 4)
+
+        ipv4BindingItem = self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv4Item()
+        mapper.map('ipv4bind', ipv4BindingItem, 'address', self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv4AddressItemName, self.chkOption(config, 'ipv4bind'), None)
+
+        ipv6BindingItem = self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv6Item()
+        mapper.map('ipv6bind', ipv6BindingItem, 'address', self.AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv6AddressItemName, self.chkOption(config, 'ipv6bind'), None)
  
         for option in config:
             mapper.execute(group, section, option)
@@ -435,4 +466,3 @@ class RtpSectionVisitors(SectionVisitors):
         self.groups.append(group)
     
         return {'success':True}
-

commit 86ed0187f6c46fc0c5eae765c355c9d05b4d08d6
Author: Darren Sessions <dsessions at digium.com>
Date:   Mon Jul 18 09:35:54 2011 -0500

    Updated the startup and shutdown event yaml files and the build yaml files to include the new test-suite remote nodes.

diff --git a/events/shutdown.yaml b/events/shutdown.yaml
index 40d109a..a97c33d 100644
--- a/events/shutdown.yaml
+++ b/events/shutdown.yaml
@@ -13,4 +13,8 @@ tests :
                         - testsuite-remote-4.digium.internal
                         - testsuite-remote-5.digium.internal
                         - testsuite-remote-6.digium.internal
+                        - testsuite-remote-7.digium.internal
+                        - testsuite-remote-8.digium.internal
+                        - testsuite-remote-9.digium.internal
+                        - testsuite-remote-10.digium.internal
                         - testsuite-builder-1.digium.internal
diff --git a/events/startup.yaml b/events/startup.yaml
index 3266a46..3d001e0 100644
--- a/events/startup.yaml
+++ b/events/startup.yaml
@@ -13,4 +13,8 @@ tests :
                         - testsuite-remote-4.digium.internal
                         - testsuite-remote-5.digium.internal
                         - testsuite-remote-6.digium.internal
+                        - testsuite-remote-7.digium.internal
+                        - testsuite-remote-8.digium.internal
+                        - testsuite-remote-9.digium.internal
+                        - testsuite-remote-10.digium.internal
                         - testsuite-builder-1.digium.internal
diff --git a/tests/build/Build_and_Distribute_Asterisk_SCF_to_TestSuite_Remotes/testcase.yaml b/tests/build/Build_and_Distribute_Asterisk_SCF_to_TestSuite_Remotes/testcase.yaml
index e24adb0..aa0a1a8 100644
--- a/tests/build/Build_and_Distribute_Asterisk_SCF_to_TestSuite_Remotes/testcase.yaml
+++ b/tests/build/Build_and_Distribute_Asterisk_SCF_to_TestSuite_Remotes/testcase.yaml
@@ -29,7 +29,7 @@ tests :
             - build :
                 testsuite_remote_host : testsuite-builder-1.digium.internal
                 cmd :
-                    pull_update : True
+                    pull_update : False
                     repo : 'git://git.asterisk.org/asterisk-scf/release/slice-plugins'
                     cd : slice-plugins
                     make_cmd :
@@ -45,7 +45,11 @@ tests :
                             - testsuite-remote-4.digium.internal
                             - testsuite-remote-5.digium.internal
                             - testsuite-remote-6.digium.internal
-                        send_dir : '/opt/Ice-3.4.1'
+                            - testsuite-remote-7.digium.internal
+                            - testsuite-remote-8.digium.internal
+                            - testsuite-remote-9.digium.internal
+                            - testsuite-remote-10.digium.internal
+                        send_dir : '/opt/Ice-3.4.2'
                         install_dir : /
     - asterisk_scf :
         timeline:
@@ -68,5 +72,9 @@ tests :
                             - testsuite-remote-4.digium.internal
                             - testsuite-remote-5.digium.internal
                             - testsuite-remote-6.digium.internal
+                            - testsuite-remote-7.digium.internal
+                            - testsuite-remote-8.digium.internal
+                            - testsuite-remote-9.digium.internal
+                            - testsuite-remote-10.digium.internal
                         send_dir : 'gitall'
                         install_dir : '!!TMP!!'
diff --git a/tests/build/Build_and_Distribute_SIPp_to_TestSuite_Remotes/testcase.yaml b/tests/build/Build_and_Distribute_SIPp_to_TestSuite_Remotes/testcase.yaml
index 8026ecc..ac12e45 100644
--- a/tests/build/Build_and_Distribute_SIPp_to_TestSuite_Remotes/testcase.yaml
+++ b/tests/build/Build_and_Distribute_SIPp_to_TestSuite_Remotes/testcase.yaml
@@ -20,5 +20,9 @@ tests :
                             - testsuite-remote-4.digium.internal
                             - testsuite-remote-5.digium.internal
                             - testsuite-remote-6.digium.internal
+                            - testsuite-remote-7.digium.internal
+                            - testsuite-remote-8.digium.internal
+                            - testsuite-remote-9.digium.internal
+                            - testsuite-remote-10.digium.internal
                         send_dir : sipp/sipp
                         install_dir : '!!TMP!!'
diff --git a/tests/build/Build_and_Distribute_the_Digium_TestSuite_to_Remotes/testcase.yaml b/tests/build/Build_and_Distribute_the_Digium_TestSuite_to_Remotes/testcase.yaml
index 447e01d..6b9b06c 100644
--- a/tests/build/Build_and_Distribute_the_Digium_TestSuite_to_Remotes/testcase.yaml
+++ b/tests/build/Build_and_Distribute_the_Digium_TestSuite_to_Remotes/testcase.yaml
@@ -53,7 +53,7 @@ tests :
     - update_testsuite-remote-5 :
         timeline :
             - build :
-                testsuite_remote_host : testsuite-remote-4.digium.internal
+                testsuite_remote_host : testsuite-remote-5.digium.internal
                 cmd :
                     pull_update : True
                     repo : 'git://git.asterisk.org/asterisk-scf/integration/testsuite'
@@ -64,7 +64,55 @@ tests :
     - update_testsuite-remote-6 :
         timeline :
             - build :
-                testsuite_remote_host : testsuite-remote-4.digium.internal
+                testsuite_remote_host : testsuite-remote-6.digium.internal
+                cmd :
+                    pull_update : True
+                    repo : 'git://git.asterisk.org/asterisk-scf/integration/testsuite'
+                    cd : testsuite
+                    make_cmd :
+                        - git checkout review
+                        - git pull
+                        - make install
+    - update_testsuite-remote-7 :
+        timeline :
+            - build :
+                testsuite_remote_host : testsuite-remote-7.digium.internal
+                cmd :
+                    pull_update : True
+                    repo : 'git://git.asterisk.org/asterisk-scf/integration/testsuite'
+                    cd : testsuite
+                    make_cmd :
+                        - git checkout review
+                        - git pull
+                        - make install
+    - update_testsuite-remote-8 :
+        timeline :
+            - build :
+                testsuite_remote_host : testsuite-remote-8.digium.internal
+                cmd :
+                    pull_update : True
+                    repo : 'git://git.asterisk.org/asterisk-scf/integration/testsuite'
+                    cd : testsuite
+                    make_cmd :
+                        - git checkout review
+                        - git pull
+                        - make install
+    - update_testsuite-remote-9 :
+        timeline :
+            - build :
+                testsuite_remote_host : testsuite-remote-9.digium.internal
+                cmd :
+                    pull_update : True
+                    repo : 'git://git.asterisk.org/asterisk-scf/integration/testsuite'
+                    cd : testsuite
+                    make_cmd :
+                        - git checkout review
+                        - git pull
+                        - make install
+    - update_testsuite-remote-10 :
+        timeline :
+            - build :
+                testsuite_remote_host : testsuite-remote-10.digium.internal
                 cmd :
                     pull_update : True
                     repo : 'git://git.asterisk.org/asterisk-scf/integration/testsuite'

commit 09e213c9098d97c966587d0c3d2ca806adbd9d8a
Author: Darren Sessions <dsessions at digium.com>
Date:   Mon Jul 18 09:25:06 2011 -0500

    Applied scenario fixes to transfer test cases. Updated these tests as well to support the new icebox configuration style and media format configurator options.

diff --git a/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/scenarios/call_then_attended_transfer.xml b/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/scenarios/call_then_attended_transfer.xml
index c18a976..8533eca 100644
--- a/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/scenarios/call_then_attended_transfer.xml
+++ b/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/scenarios/call_then_attended_transfer.xml
@@ -123,8 +123,7 @@
         ]]>
     </send>
 
-    <recv response="200" optional="false" />
-    <recv request="NOTIFY" optional="false" />
+    <recv request="BYE" optional="false" />
 
     <send>
         <![CDATA[
@@ -142,7 +141,25 @@
         ]]>
     </send>
 
-    <recv request="NOTIFY" optional="false" />
+    <recv response="200" optional="false" />
+
+    <send>
+        <![CDATA[
+
+        ACK sip:[field2 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+        Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+        From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+        To: [field2 line="[$line]"] <sip:[field2 line="[$line]"]@[remote_ip]:[remote_port]>[peer_tag_param]
+        Call-ID: [call_id]
+        CSeq: 1 ACK
+        Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+        Max-Forwards: 70
+        Content-Length: 0
+
+        ]]>
+    </send>
+
+    <recv request="BYE" optional="false" />
 
     <send>
         <![CDATA[
@@ -159,4 +176,5 @@
 
         ]]>
     </send>
+
 </scenario>
diff --git a/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/scenarios/wait_for_call_do_hangup.xml b/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/scenarios/wait_for_call_do_hangup.xml
index 0ee9b88..2b2226c 100644
--- a/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/scenarios/wait_for_call_do_hangup.xml
+++ b/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/scenarios/wait_for_call_do_hangup.xml
@@ -9,7 +9,12 @@
     </nop>
     <Reference variables="file,user" />
 
-    <recv request="INVITE" crlf="true" />
+    <recv request="INVITE" crlf="true">
+        <action>
+            <ereg regexp="sip(.*)\:5060" search_in="hdr" header="Contact:" check_it="true" assign_to="1" />
+            <ereg regexp="tag=.*" search_in="hdr" header="From:" check_it="true" assign_to="2" />
+        </action>
+    </recv>
 
     <send>
         <![CDATA[
@@ -55,15 +60,15 @@
 
     <recv request="ACK" optional="false" />
 
-    <pause milliseconds="3000" />
+    <pause milliseconds="2000" />
 
     <send retrans="500">
         <![CDATA[
 
-        BYE sip:10.19.139.77:5060 SIP/2.0
+        BYE [$1] SIP/2.0
         [last_Via:]
-        [last_From:]
-        [last_To:]
+        From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=2
+        To: <[$1]>;[$2]
         [last_Call-ID:]
         CSeq: 2 BYE
         Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
@@ -73,5 +78,6 @@
         ]]>
     </send>
 
-    <recv response="200" optional="false" />
+    <recv response="200" rtd="true" rrs="true" />
+
 </scenario>
diff --git a/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/testcase.yaml b/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/testcase.yaml
index a295fdd..a149f7d 100644
--- a/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/testcase.yaml
+++ b/tests/asterisk_scf_components/sip/Functional_Attended_Transfer/testcase.yaml
@@ -9,7 +9,7 @@ docs :
     requirements : 'Asterisk SCF, SIPp, Wireshark (optional), CallFlow (optional)'
 tests :
     - ipv4toipv4_transfer_to_ipv4 :
-        expected_failure : True
+        expected_failure : False
         timeline:
             - wireshark :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
@@ -30,11 +30,14 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     start :
-                        - service_locator
-                        - bridge
-                        - routing
-                        - sip_session_gateway
-                        - media_rtp_pjmedia
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
             - asteriskscf_configurator :
                 service_locator_host : testsuite-remote-1.digium.internal
                 configuration_wipe : False
@@ -55,6 +58,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - waitforcalldohangup :
                             type : endpoint
                             targethost : testsuite-remote-3.digium.internal
@@ -65,6 +69,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                         - callthenattendedtransfer :
                             type : endpoint
                             targethost : testsuite-remote-4.digium.internal
@@ -75,6 +80,7 @@ tests :
                             direction : both
                             securetransport : none
                             rtpoveripv6 : False
+                            formats : 'ulaw/8000'
                     rtp :
                          - general :
                             startport : 10001
@@ -129,3 +135,790 @@ tests :
                 testsuite_remote_host : testsuite-remote-1.digium.internal
                 cmd :
                     stop :
+    - ipv4toipv4_transfer_to_ipv6 :
+        expected_failure : False
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp4 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv4
+                        - listen_udp6 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv6
+                        - waitforcall :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                            formats : 'ulaw/8000'
+                        - waitforcalldohangup :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                            formats : 'ulaw/8000'
+                        - callthenattendedtransfer :
+                            type : endpoint
+                            targethost : testsuite-remote-4.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                            formats : 'ulaw/8000'
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                cmd :
+                    - generate_injection_file :
+                        redistribute_to_hosts :
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        matrix :
+                            - 'USER' 
+                            - '# from, expiry, to, refer-to'
+                            - 'waitforcall;120;callthenattendedtransfer;waitforcalldohangup'
+                            - 'waitforcalldohangup;120;waitforcall;callthenattendedtransfer'
+                            - 'callthenattendedtransfer;120;waitforcalldohangup;waitforcall'
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv6
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call_do_hangup.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv4
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-4.digium.internal
+                cmd :
+                    - uac :
+                        scenario_file : call_then_attended_transfer.xml
+                        index : 0
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv4
+                        transport : udp
+                        timeout : 120
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
+    - ipv4toipv6_transfer_to_ipv4 :
+        expected_failure : False
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp4 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv4
+                        - listen_udp6 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv6
+                        - waitforcall :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                            formats : 'ulaw/8000'
+                        - waitforcalldohangup :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                            formats : 'ulaw/8000'
+                        - callthenattendedtransfer :
+                            type : endpoint
+                            targethost : testsuite-remote-4.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                            formats : 'ulaw/8000'
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                cmd :
+                    - generate_injection_file :
+                        redistribute_to_hosts :
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        matrix :
+                            - 'USER' 
+                            - '# from, expiry, to, refer-to'
+                            - 'waitforcall;120;callthenattendedtransfer;waitforcalldohangup'
+                            - 'waitforcalldohangup;120;waitforcall;callthenattendedtransfer'
+                            - 'callthenattendedtransfer;120;waitforcalldohangup;waitforcall'
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv4
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call_do_hangup.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv6
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-4.digium.internal
+                cmd :
+                    - uac :
+                        scenario_file : call_then_attended_transfer.xml
+                        index : 0
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv4
+                        transport : udp
+                        timeout : 120
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
+    - ipv6toipv4_transfer_to_ipv4 :
+        expected_failure : False
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp4 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv4
+                        - listen_udp6 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv6
+                        - waitforcall :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                            formats : 'ulaw/8000'
+                        - waitforcalldohangup :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                            formats : 'ulaw/8000'
+                        - callthenattendedtransfer :
+                            type : endpoint
+                            targethost : testsuite-remote-4.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                            formats : 'ulaw/8000'
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                cmd :
+                    - generate_injection_file :
+                        redistribute_to_hosts :
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        matrix :
+                            - 'USER' 
+                            - '# from, expiry, to, refer-to'
+                            - 'waitforcall;120;callthenattendedtransfer;waitforcalldohangup'
+                            - 'waitforcalldohangup;120;waitforcall;callthenattendedtransfer'
+                            - 'callthenattendedtransfer;120;waitforcalldohangup;waitforcall'
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv4
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call_do_hangup.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv4
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-4.digium.internal
+                cmd :
+                    - uac :
+                        scenario_file : call_then_attended_transfer.xml
+                        index : 0
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv6
+                        transport : udp
+                        timeout : 120
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
+    - ipv6toipv6_transfer_to_ipv4 :
+        expected_failure : False
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp4 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv4
+                        - listen_udp6 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv6
+                        - waitforcall :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                            formats : 'ulaw/8000'
+                        - waitforcalldohangup :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                            formats : 'ulaw/8000'
+                        - callthenattendedtransfer :
+                            type : endpoint
+                            targethost : testsuite-remote-4.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                            formats : 'ulaw/8000'
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                cmd :
+                    - generate_injection_file :
+                        redistribute_to_hosts :
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        matrix :
+                            - 'USER' 
+                            - '# from, expiry, to, refer-to'
+                            - 'waitforcall;120;callthenattendedtransfer;waitforcalldohangup'
+                            - 'waitforcalldohangup;120;waitforcall;callthenattendedtransfer'
+                            - 'callthenattendedtransfer;120;waitforcalldohangup;waitforcall'
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv4
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call_do_hangup.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv6
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-4.digium.internal
+                cmd :
+                    - uac :
+                        scenario_file : call_then_attended_transfer.xml
+                        index : 0
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv6
+                        transport : udp
+                        timeout : 120
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
+    - ipv6toipv4_transfer_to_ipv6 :
+        expected_failure : False
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
+                cmd :
+                    sip :
+                        - listen_udp4 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv4
+                        - listen_udp6 :
+                            type : transport_udp
+                            host : testsuite-remote-1.digium.internal
+                            port : 5060
+                            ipv4oripv6 : ipv6
+                        - waitforcall :
+                            type : endpoint
+                            targethost : testsuite-remote-2.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                            formats : 'ulaw/8000'
+                        - waitforcalldohangup :
+                            type : endpoint
+                            targethost : testsuite-remote-3.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv4
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : False
+                            formats : 'ulaw/8000'
+                        - callthenattendedtransfer :
+                            type : endpoint
+                            targethost : testsuite-remote-4.digium.internal
+                            targetport : 5060
+                            sourcehost : testsuite-remote-1.digium.internal
+                            sourceport : 5060
+                            ipv4oripv6 : ipv6
+                            direction : both
+                            securetransport : none
+                            rtpoveripv6 : True
+                            formats : 'ulaw/8000'
+                    rtp :
+                         - general :
+                            startport : 10001
+                            endport : 20000
+                            workerthreadcount : 4
+            - sipp:
+                cmd :
+                    - generate_injection_file :
+                        redistribute_to_hosts :
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        matrix :
+                            - 'USER' 
+                            - '# from, expiry, to, refer-to'
+                            - 'waitforcall;120;callthenattendedtransfer;waitforcalldohangup'
+                            - 'waitforcalldohangup;120;waitforcall;callthenattendedtransfer'
+                            - 'callthenattendedtransfer;120;waitforcalldohangup;waitforcall'
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv6
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uas :
+                        scenario_file : wait_for_call_do_hangup.xml
+                        index : 0
+                        transport : udp
+                        ipv4oripv6 : ipv4
+                        timeout : 120
+            - sipp:
+                testsuite_remote_host : testsuite-remote-4.digium.internal
+                cmd :
+                    - uac :
+                        scenario_file : call_then_attended_transfer.xml
+                        index : 0
+                        calls : 1
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv6
+                        transport : udp
+                        timeout : 120
+            - wireshark :
+                run_on_test_failure : True
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    stop :
+    - ipv6toipv6_transfer_to_ipv6 :
+        expected_failure : False
+        timeline:
+            - wireshark :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start:
+                        host_filter :
+                            - testsuite-remote-1.digium.internal
+                            - testsuite-remote-2.digium.internal
+                            - testsuite-remote-3.digium.internal
+                            - testsuite-remote-4.digium.internal
+                        protocol_filter :
+                            - sip
+                            - rtp
+                            - icmp
+                            - t38
+                            - dns
+            - asteriskscf_icebox :
+                testsuite_remote_host : testsuite-remote-1.digium.internal
+                cmd :
+                    start :
+                        components :
+                            - service_locator
+                            - bridge
+                            - routing
+                            - sip_session_gateway
+                            - media_rtp_pjmedia
+                            - media_format_generic
+                        mode : standalone
+            - asteriskscf_configurator :
+                service_locator_host : testsuite-remote-1.digium.internal
+                configuration_wipe : False
... 1022 lines suppressed ...


-- 
asterisk-scf/integration/testsuite.git



More information about the asterisk-scf-commits mailing list