CTS: support new pacemaker-cts

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>

cts/corosync.py

@@ -206,7 +206,7 @@ class corosync_flatiron(ClusterManager):
             self.node_to_ip[node] = socket.gethostbyname (node)
         return self.node_to_ip[node]
 
-    def StartaCM(self, node):
+    def StartaCM(self, node, verbose=False):
 
         if not self.ShouldBeStatus.has_key(node):
             self.ShouldBeStatus[node] = "down"
@@ -239,7 +239,7 @@ class corosync_flatiron(ClusterManager):
 
         return ret
 
-    def StopaCM(self, node):
+    def StopaCM(self, node, verbose=False):
         if self.ShouldBeStatus[node] != "up":
             return 1
 
@@ -417,7 +417,7 @@ class TestAgent(object):
         self.env.debug('test agent: starting %s on node %s' % (self.binary, self.node))
         self.sock = socket.socket (socket.AF_INET, socket.SOCK_STREAM)
         ip = socket.gethostbyname(self.node)
-        self.rsh(self.node, self.binary, blocking=0)
+        self.rsh(self.node, self.binary, synchronous=False)
         is_connected = False
         retries = 0
         while not is_connected:

cts/corotests.py

@@ -1262,7 +1262,7 @@ confirm watchdog action
         self.CM.rsh(node, 'modprobe softdog')
         self.CM.StartaCM(node)
         
-        self.CM.rsh(node, ':(){ :|:& };:', blocking=0)
+        self.CM.rsh(node, ':(){ :|:& };:', synchronous=0)
 
         self.CM.log("wait for it to watchdog")
         time.sleep(60 * 3)
@@ -1488,7 +1488,7 @@ confirm reboot action
         cmd = 'corosync-objctl -w resources.system.memory_used.max=' + str(mem_new_max)
         self.CM.rsh(node, cmd)
 
-        self.CM.rsh(node, 'memhog -r10000 200m', blocking=0)
+        self.CM.rsh(node, 'memhog -r10000 200m', synchronous=0)
 
         self.CM.log("wait for it to reboot")
         time.sleep(60 * 3)