[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 May 25 13:27:34 CDT 2011
branch "review" has been updated
via 1ac13d833296b692119989a23c896e14d498f582 (commit)
from 04992c28c8f7a68e3edab8219f8d5f162fe3bac1 (commit)
Summary of changes:
plugins/failover.py | 8 +--
.../testcase.yaml | 86 --------------------
.../testcase.yaml | 21 +++++
tests/failover/tests.yaml | 2 +-
4 files changed, 24 insertions(+), 93 deletions(-)
delete mode 100644 tests/failover/SysTest_Functional_BasicCallSetupFailover/testcase.yaml
create mode 100644 tests/failover/SysTest_Functional_Basic_Call_Setup_w_Failover/testcase.yaml
- Log -----------------------------------------------------------------
commit 1ac13d833296b692119989a23c896e14d498f582
Author: Darren Sessions <dsessions at digium.com>
Date: Wed May 25 13:27:30 2011 -0500
working on failover plugin. yaml file updates. plugin updates. remote script update.
diff --git a/plugins/failover.py b/plugins/failover.py
index 03d89d8..871b36f 100644
--- a/plugins/failover.py
+++ b/plugins/failover.py
@@ -35,11 +35,9 @@ class testsuite(util.TestSuiteRemoteBaseClass):
else:
return {'success':False,'msg':'The %s command is invalid.' % cmd}
- return {'success':False}
-
return {'success':True}
- def _corosyncConfig(self, ipV, nodeID, staticIntIP):
+ def _corosyncConfig(self, ipV, nodeID, hostIP):
if ipV == 4:
config = [
'totem {',
@@ -57,9 +55,7 @@ class testsuite(util.TestSuiteRemoteBaseClass):
' rrp_mode: none',
' interface {',
' ringnumber: 0',
- ' bindnetaddr: %s' % staticIntIP,
- ' mcastaddr: 226.94.1.1',
- ' mcastport: 5405',
+ ' bindnetaddr: %s' % hostIP,
' }',
'}',
'amf {',
diff --git a/tests/failover/SysTest_Functional_BasicCallSetupFailover/testcase.yaml b/tests/failover/SysTest_Functional_BasicCallSetupFailover/testcase.yaml
deleted file mode 100644
index c2816e8..0000000
--- a/tests/failover/SysTest_Functional_BasicCallSetupFailover/testcase.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-name : SysTest_Functional_BasicCallSetupFailover
-options :
- network_captures: True
- call_flow_diagrams: True
- restart_persistant_plugins_between_tests: False
-tests :
- - ipv4toipv4 :
- expected_failure : False
- timeline :
- - failover :
- testsuite_remote : box1
- cmd :
- start :
- - corosync :
- token : 160
- token_retransmits_before_loss_const : 3
- join : 30
- consensus : 300
- max_messages : 20
- ipv4oripv6 : ipv4
- - pacemaker :
- shared_ip : testsuite-shared-ipv4.digium.internal
- - failover :
- testsuite_remote : box2
- cmd :
- start :
- - corosync :
- token : 160
- token_retransmits_before_loss_const : 3
- join : 30
- consensus : 300
- max_messages : 20
- ipv4oripv6 : ipv4
- - pacemaker :
- shared_ip : testsuite-shared-ipv4.digium.internal
- - asteriskscf_icebox :
- testsuite_remote : testsuite-server.digium.internal
- cmd :
- start :
- - service_locator_replicator
- - service_locator
- - logger_server
- - bridge_state_replicator
- - bridge
- - routing_state_replicator
- - routing
- - sip_state_replicator
- - sip_session_gateway
- - rtp_state_replicator
- - asteriskscf_configurator :
- testsuite_remote : testsuite-server.digium.internal
- configuration_wipe : True
- cmd :
- sip :
- - localhost_udp :
- type : transport_udp
- host : testsuite-shared-ipv4.digium.internal
- port : 5060
- - service :
- type : endpoint
- targethost : 10.19.139.77
- targetport : 5060
- direction : both
- - sipp :
- type : endpoint
- targethost : 10.19.139.79
- targetport : 5060
- direction : both
- - sipp:
- testsuite_remote : testsuite-remote-1.digium.internal
- cmd :
- - uas :
- transport : udp
- - sipp:
- testsuite_remote : testsuite-remote-2.digium.internal
- cmd :
- - uac :
- transport : udp
- calls : 10
- cps : 1
- duration : 10
- targethost : 10.19.139.80
- targetport : 5060
- - ipv6toipv6 :
- - ipv4toipv6 :
- - ipv6toipv4 :
diff --git a/tests/failover/SysTest_Functional_Basic_Call_Setup_w_Failover/testcase.yaml b/tests/failover/SysTest_Functional_Basic_Call_Setup_w_Failover/testcase.yaml
new file mode 100644
index 0000000..36b46de
--- /dev/null
+++ b/tests/failover/SysTest_Functional_Basic_Call_Setup_w_Failover/testcase.yaml
@@ -0,0 +1,21 @@
+name : SysTest_Functional_Basic_Call_Setup_w_Failover
+options :
+ network_captures: True
+ call_flow_diagrams: True
+ restart_persistant_plugins_between_tests: False
+tests :
+ - ipv4toipv4 :
+ expected_failure : False
+ timeline :
+ - failover :
+ testsuite_remote : testsuite-remote-1.digium.internal
+ cmd :
+ testsuite_remote_standby : testsuite-remote-2.digium.internal
+ start :
+ - corosync :
+ ipv4oripv6 : ipv4
+ nodeID : 0
+ - pacemaker :
+ other_node : testsuite-remote-2.digium.internal
+ preferred_resource_owner : True
+ shared_ip : 10.19.139.44
diff --git a/tests/failover/tests.yaml b/tests/failover/tests.yaml
index 5d47be3..81dd7d1 100644
--- a/tests/failover/tests.yaml
+++ b/tests/failover/tests.yaml
@@ -1,2 +1,2 @@
tests :
- - testcase : SysTest_Functional_BasicCallSetupFailover
+ - testcase : SysTest_Functional_Basic_Call_Setup_w_Failover
-----------------------------------------------------------------------
--
asterisk-scf/integration/testsuite.git
More information about the asterisk-scf-commits
mailing list