[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.

[Commits to the Asterisk SCF project code repositories]

branch "review" has been updated
       via  e90197a1b5da98fc0275b672125cb7fb5cfb0aaf (commit)
      from  186633752f88b475d0c59eb5bc9dd9e19d388def (commit)

Summary of changes:
 plugins/failover.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit e90197a1b5da98fc0275b672125cb7fb5cfb0aaf
Author: Darren Sessions <dsessions at digium.com>
Date:   Thu May 26 14:06:28 2011 -0500

    converted the corosync commands over to use the init script. FAILOVER WORKS!!

diff --git a/plugins/failover.py b/plugins/failover.py
index 0498b2b..4a9a02d 100644
--- a/plugins/failover.py
+++ b/plugins/failover.py
@@ -72,24 +72,24 @@ class plugin(TestSuite.BaseClass):
         results = activeNode['rpc'].wFile('/etc/corosync/corosync.conf', '\n'.join(self._corosyncConfig(activeNode[ipv], standbyNode[ipv], activeNode['nodeID'], activeNode['nAddr'])))
         if not results['success'] == True:
             return self._addShutdownList(results, shutdownList)
-        results = activeNode['rpc'].run('failover', 'corosync', ['corosync', '-f'])
+        results = activeNode['rpc'].run('failover', 'corosync', ['service', 'corosync', 'start'], True)
         if not results['success'] == True:
             return self._addShutdownList(results, shutdownList)
         
         standbyNode['rpc'].wFile('/etc/corosync/corosync.conf', '\n'.join(self._corosyncConfig(activeNode[ipv], standbyNode[ipv], standbyNode['nodeID'], standbyNode['nAddr'])))
         if not results['success'] == True:
             return self._addShutdownList(results, shutdownList)
-        results = standbyNode['rpc'].run('failover', 'corosync', ['corosync', '-f'])
+        results = standbyNode['rpc'].run('failover', 'corosync', ['service', 'corosync', 'start'], True)
         if not results['success'] == True:
             return self._addShutdownList(results, shutdownList)
 
+        time.sleep(100)
+
         activeNode['rpc'].writeFile('pacemaker.cli', '\n'.join(self._pacemakerConfig(sharedIP, testData['cmd']['testsuite_remote_active'])))
         if not results['success'] == True:
             return self._addShutdownList(results, shutdownList)
         results = activeNode['rpc'].run('failover', 'crm', ['crm', '-f', '!!TMP!!/pacemaker.cli'], True)
 
-        time.sleep(100)
-
         if not self.ping(sharedIP):
             return {'success':False, 'msg':'The %s shared ip address is failing to respond.' % sharedIP, 'shutdownList':shutdownList}
 
@@ -144,7 +144,7 @@ class plugin(TestSuite.BaseClass):
             '    to_logfile: no',
             '    to_syslog: yes',
             '    syslog_facility: daemon',
-            '    debug: on',
+            '    debug: off',
             '    timestamp: on',
             '    logger_subsys {',
             '        subsys: AMF',

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


-- 
asterisk-scf/integration/testsuite.git