[asterisk-scf-commits] asterisk-scf/release/testsuite.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon May 14 11:35:34 CDT 2012
branch "master" has been updated
via 4a06979733b74b417628fc1f90b4cb3857c52b29 (commit)
via fad4019b258e193a8a6f895edc82c5065c4b4c8e (commit)
via 41b00a73bbce1ebcd516aa8337028595ca315827 (commit)
from 128e1ecbcab182ef00e62932c95236ea12e25043 (commit)
Summary of changes:
plugins/asteriskscf_activator.py | 23 +++++++++++++++---
plugins/sipp.py | 8 +++---
tests/asteriskscf/failover/bridge/testcase.yaml | 24 ++++++++++----------
.../failover/media_ops_core/testcase.yaml | 24 ++++++++++----------
tests/asteriskscf/failover/media_rtp/testcase.yaml | 24 ++++++++++----------
.../failover/media_transport_udptl/testcase.yaml | 24 ++++++++++----------
tests/asteriskscf/failover/routing/testcase.yaml | 24 ++++++++++----------
.../failover/service_discovery/testcase.yaml | 24 ++++++++++----------
tests/asteriskscf/failover/sip/testcase.yaml | 24 ++++++++++----------
9 files changed, 107 insertions(+), 92 deletions(-)
- Log -----------------------------------------------------------------
commit 4a06979733b74b417628fc1f90b4cb3857c52b29
Author: Darren Sessions <dsessions at digium.com>
Date: Mon May 14 11:35:20 2012 -0500
Updated tests to reflect testsuite-remote-2 and testsuite-remote-3 hosts being up and running again.
diff --git a/tests/asteriskscf/failover/bridge/testcase.yaml b/tests/asteriskscf/failover/bridge/testcase.yaml
index 64ab626..93843b4 100644
--- a/tests/asteriskscf/failover/bridge/testcase.yaml
+++ b/tests/asteriskscf/failover/bridge/testcase.yaml
@@ -14,8 +14,8 @@ tests :
- failover :
cmd :
assign :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_icebox :
@@ -32,7 +32,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-2.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -41,7 +41,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -77,7 +77,7 @@ tests :
ipv4oripv6 : ipv4
- service :
type : endpoint
- targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-4.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -88,7 +88,7 @@ tests :
formats : 'ulaw/8000'
- sipp :
type : endpoint
- targethost : [testsuite-remote-6.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -104,14 +104,14 @@ tests :
endport : 20000
workerthreadcount : 4
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
@@ -124,8 +124,8 @@ tests :
- failover :
cmd :
failover :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_activator :
@@ -137,14 +137,14 @@ tests :
instance_id : BridgeManagerStandby
service_name : default
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
diff --git a/tests/asteriskscf/failover/media_ops_core/testcase.yaml b/tests/asteriskscf/failover/media_ops_core/testcase.yaml
index a3a1dd3..c16af6d 100644
--- a/tests/asteriskscf/failover/media_ops_core/testcase.yaml
+++ b/tests/asteriskscf/failover/media_ops_core/testcase.yaml
@@ -14,8 +14,8 @@ tests :
- failover :
cmd :
assign :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_icebox :
@@ -31,7 +31,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-2.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -40,7 +40,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -77,7 +77,7 @@ tests :
ipv4oripv6 : ipv4
- service :
type : endpoint
- targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-4.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -88,7 +88,7 @@ tests :
formats : 'ulaw/8000'
- sipp :
type : endpoint
- targethost : [testsuite-remote-6.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -104,14 +104,14 @@ tests :
endport : 20000
workerthreadcount : 4
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
@@ -124,8 +124,8 @@ tests :
- failover :
cmd :
failover :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_activator :
@@ -137,14 +137,14 @@ tests :
instance_id : MediaServiceRTPStandby
service_name : default
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
diff --git a/tests/asteriskscf/failover/media_rtp/testcase.yaml b/tests/asteriskscf/failover/media_rtp/testcase.yaml
index 9b25a64..001e85b 100644
--- a/tests/asteriskscf/failover/media_rtp/testcase.yaml
+++ b/tests/asteriskscf/failover/media_rtp/testcase.yaml
@@ -14,8 +14,8 @@ tests :
- failover :
cmd :
assign :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_icebox :
@@ -31,7 +31,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-2.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -40,7 +40,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -77,7 +77,7 @@ tests :
ipv4oripv6 : ipv4
- service :
type : endpoint
- targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-4.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -88,7 +88,7 @@ tests :
formats : 'ulaw/8000'
- sipp :
type : endpoint
- targethost : [testsuite-remote-6.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -104,14 +104,14 @@ tests :
endport : 20000
workerthreadcount : 4
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
@@ -124,8 +124,8 @@ tests :
- failover :
cmd :
failover :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_activator :
@@ -137,14 +137,14 @@ tests :
instance_id : MediaServiceRTPStandby
service_name : default
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
diff --git a/tests/asteriskscf/failover/media_transport_udptl/testcase.yaml b/tests/asteriskscf/failover/media_transport_udptl/testcase.yaml
index 91a9eb0..972ee4c 100644
--- a/tests/asteriskscf/failover/media_transport_udptl/testcase.yaml
+++ b/tests/asteriskscf/failover/media_transport_udptl/testcase.yaml
@@ -14,8 +14,8 @@ tests :
- failover :
cmd :
assign :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_icebox :
@@ -32,7 +32,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-2.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -41,7 +41,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -78,7 +78,7 @@ tests :
ipv4oripv6 : ipv4
- service :
type : endpoint
- targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-4.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -89,7 +89,7 @@ tests :
formats : 'ulaw/8000'
- sipp :
type : endpoint
- targethost : [testsuite-remote-6.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -105,14 +105,14 @@ tests :
endport : 20000
workerthreadcount : 4
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
@@ -125,8 +125,8 @@ tests :
- failover :
cmd :
failover :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_activator :
@@ -138,14 +138,14 @@ tests :
instance_id : MediaTransportUDPTLStandby
service_name : default
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
diff --git a/tests/asteriskscf/failover/routing/testcase.yaml b/tests/asteriskscf/failover/routing/testcase.yaml
index 7c3309f..b2112d5 100644
--- a/tests/asteriskscf/failover/routing/testcase.yaml
+++ b/tests/asteriskscf/failover/routing/testcase.yaml
@@ -14,8 +14,8 @@ tests :
- failover :
cmd :
assign :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_icebox :
@@ -33,7 +33,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-2.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -42,7 +42,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -77,7 +77,7 @@ tests :
ipv4oripv6 : ipv4
- service :
type : endpoint
- targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-4.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -88,7 +88,7 @@ tests :
formats : 'ulaw/8000'
- sipp :
type : endpoint
- targethost : [testsuite-remote-6.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -104,14 +104,14 @@ tests :
endport : 20000
workerthreadcount : 4
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
@@ -124,8 +124,8 @@ tests :
- failover :
cmd :
failover :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_activator :
@@ -137,14 +137,14 @@ tests :
instance_id : RoutingServiceStandby
service_name : default
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
diff --git a/tests/asteriskscf/failover/service_discovery/testcase.yaml b/tests/asteriskscf/failover/service_discovery/testcase.yaml
index 5c73d16..28030a4 100644
--- a/tests/asteriskscf/failover/service_discovery/testcase.yaml
+++ b/tests/asteriskscf/failover/service_discovery/testcase.yaml
@@ -14,8 +14,8 @@ tests :
- failover :
cmd :
assign :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_icebox :
@@ -28,7 +28,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-2.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -37,7 +37,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -78,7 +78,7 @@ tests :
ipv4oripv6 : ipv4
- service :
type : endpoint
- targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-4.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -89,7 +89,7 @@ tests :
formats : 'ulaw/8000'
- sipp :
type : endpoint
- targethost : [testsuite-remote-6.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [testsuite-remote-1.digium.internal, public1, ipv4]
sourceport : 5060
@@ -105,14 +105,14 @@ tests :
endport : 20000
workerthreadcount : 4
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
@@ -125,8 +125,8 @@ tests :
- failover :
cmd :
failover :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_activator :
@@ -138,14 +138,14 @@ tests :
instance_id : ServiceDiscoveryStandby
service_name : default
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
diff --git a/tests/asteriskscf/failover/sip/testcase.yaml b/tests/asteriskscf/failover/sip/testcase.yaml
index b1514a3..13ca672 100644
--- a/tests/asteriskscf/failover/sip/testcase.yaml
+++ b/tests/asteriskscf/failover/sip/testcase.yaml
@@ -14,8 +14,8 @@ tests :
- failover :
cmd :
assign :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_icebox :
@@ -34,7 +34,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-10.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-2.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -43,7 +43,7 @@ tests :
mode : failover
- asteriskscf_icebox :
service_locator : [testsuite-remote-1.digium.internal, public1, ipv4]
- remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-3.digium.internal, public1, ipv4]
shared_addr : [failover-shared-ip-1, public1, ipv4]
cmd :
start :
@@ -70,7 +70,7 @@ tests :
ipv4oripv6 : ipv4
- service :
type : endpoint
- targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-4.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [failover-shared-ip-1, public1, ipv4]
sourceport : 5060
@@ -81,7 +81,7 @@ tests :
formats : 'ulaw/8000'
- sipp :
type : endpoint
- targethost : [testsuite-remote-6.digium.internal, public1, ipv4]
+ targethost : [testsuite-remote-5.digium.internal, public1, ipv4]
targetport : 5060
sourcehost : [failover-shared-ip-1, public1, ipv4]
sourceport : 5060
@@ -97,14 +97,14 @@ tests :
endport : 20000
workerthreadcount : 4
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
@@ -117,8 +117,8 @@ tests :
- failover :
cmd :
failover :
- active_testsuite_remote_host : [testsuite-remote-10.digium.internal, public1, ipv4]
- standby_testsuite_remote_host : [testsuite-remote-4.digium.internal, public1, ipv4]
+ active_testsuite_remote_host : [testsuite-remote-3.digium.internal, public1, ipv4]
+ standby_testsuite_remote_host : [testsuite-remote-2.digium.internal, public1, ipv4]
address_pool : failover_pool_1
shared_ip_label : failover-shared-ip-1
- asteriskscf_activator :
@@ -130,14 +130,14 @@ tests :
instance_id : SIPServiceStandby
service_name : default
- sipp:
- remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-4.digium.internal, public1, ipv4]
cmd :
- uas :
transport : udp
ipv4oripv6 : ipv4
timeout : 10
- sipp:
- remote_agent : [testsuite-remote-6.digium.internal, public1, ipv4]
+ remote_agent : [testsuite-remote-5.digium.internal, public1, ipv4]
cmd :
- uac :
calls : 1
commit fad4019b258e193a8a6f895edc82c5065c4b4c8e
Author: Darren Sessions <dsessions at digium.com>
Date: Mon May 14 11:21:20 2012 -0500
Added the ability to skip the service locator as needed for the service locator failover test when there are no active service locators.
diff --git a/plugins/asteriskscf_activator.py b/plugins/asteriskscf_activator.py
index 93314fc..05c3983 100644
--- a/plugins/asteriskscf_activator.py
+++ b/plugins/asteriskscf_activator.py
@@ -67,6 +67,11 @@ class plugin(Plugin.BaseClass):
else:
discovery_replica_host = None
+ if 'skip_service_locator_host' in testData:
+ skip_service_locator_host = True
+ else:
+ skip_service_locator_host = False
+
if not 'replica_name' in testData['cmd']['activate']:
return {'success':False, 'msg':'A replica name is required.'}
@@ -81,18 +86,21 @@ class plugin(Plugin.BaseClass):
testData['cmd']['activate']['instance_id'],
testData['cmd']['activate']['service_name'],
discovery_replica_host,
- service_locator_host).main([''])
+ service_locator_host,
+ skip_service_locator_host).main([''])
+ time.sleep(1)
return res
class ReplicaActivatorApp(Ice.Application):
- def __init__(self, AsteriskSCF, replica_name, instance_id, service_name, discoveryReplicaStringHost, serviceLocatorStringHost):
+ def __init__(self, AsteriskSCF, replica_name, instance_id, service_name, discoveryReplicaStringHost, serviceLocatorStringHost, skip_service_locator_host):
self.AsteriskSCF = AsteriskSCF
self.replica_name = replica_name
self.instance_id = instance_id
self.service_name = service_name
self.discoveryReplicaStringHost = discoveryReplicaStringHost
self.serviceLocatorStringHost = serviceLocatorStringHost
+ self.skip_service_locator_host = skip_service_locator_host
def createContext(self):
newContext = self.AsteriskSCF.System.V1.OperationContext()
@@ -113,7 +121,10 @@ class ReplicaActivatorApp(Ice.Application):
serviceLocatorString = serviceLocatorString + ' -h ' + self.serviceLocatorStringHost
- discoveryReplica = self.AsteriskSCF.System.Component.V1.ReplicaPrx.checkedCast(self.communicator().stringToProxy(discoveryReplicaString))
+ try:
+ discoveryReplica = self.AsteriskSCF.System.Component.V1.ReplicaPrx.checkedCast(self.communicator().stringToProxy(discoveryReplicaString))
+ except:
+ return {'success':False,'msg':"Exception trying to activate a Service Locator component: %s" % sys.exc_info()[1]}
if discoveryReplica == None:
return {'success':False,'msg':"Invalid Replica proxy specified."}
@@ -122,9 +133,13 @@ class ReplicaActivatorApp(Ice.Application):
discoveryReplica.activate(self.createContext())
except:
return {'success':False,'msg':"Exception trying to activate a Service Locator component: %s" % sys.exc_info()[1]}
+
#except Ice.Exception as ex:
# return {'success':False,'msg':"Exception trying to activate a Service Locator component: " + ex.what()}
+ if self.skip_service_locator_host == True:
+ return {'success':True}
+
# We have an active Service Locator component. Get a proxy to the Service Locator interface so that
# we can lookup registered interfaces.
serviceLocator = self.AsteriskSCF.Core.Discovery.V1.ServiceLocatorPrx.checkedCast(self.communicator().stringToProxy(serviceLocatorString))
@@ -141,7 +156,7 @@ class ReplicaActivatorApp(Ice.Application):
try:
componentReplicaObjPrx = serviceLocator.locate(componentLocatorParams)
except self.AsteriskSCF.Core.Discovery.V1.ServiceNotFound:
- return {'success':False,'msg':'The \'%s\' replica interface was not found by the specified service locator.' % self.replica_name}
+ return {'success':False,'msg':'The \'%s\' replica interface was not found by the specified service locator. %s' % (self.replica_name, sys.exc_info()[1])}
componentReplica = self.AsteriskSCF.System.Component.V1.ReplicaPrx.checkedCast(componentReplicaObjPrx)
commit 41b00a73bbce1ebcd516aa8337028595ca315827
Author: Darren Sessions <dsessions at digium.com>
Date: Mon May 14 11:19:48 2012 -0500
Modified the SIPp plugin to use the global vars test info variable so as to be consistent with the rest of the test-suite code.
diff --git a/plugins/sipp.py b/plugins/sipp.py
index 6735dff..d034344 100644
--- a/plugins/sipp.py
+++ b/plugins/sipp.py
@@ -105,11 +105,11 @@ class plugin(Plugin.BaseClass):
execCmd = ['!!TMP!!/sipp/sipp/trunk/sipp']
if 'scenario_file' in config:
- results = self.file().read('%s/%s/scenarios/%s' % (globalVars.cwd, testPath, config['scenario_file']))
- if results['success'] == False:
- return results
+ res = self.readFile('%s/tests/asteriskscf/%s/scenarios/%s' % (globalVars.cwd, globalVars.testInfo['testPath'], config['scenario_file']))
+ if res['success'] == False:
+ return res
- res = globalVars.rpc.cmd[remote_agent[0]]('writeFile', '%s' % config['scenario_file'], results['fd'])
+ res = globalVars.rpc.cmd[remote_agent[0]]('writeFile', '!!TMP!!/%s' % config['scenario_file'], res['data'])
if res['success'] == False:
return res
-----------------------------------------------------------------------
--
asterisk-scf/release/testsuite.git
More information about the asterisk-scf-commits
mailing list