svn commit: r1150542 - /incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py

[st...@apache.org]

Author: stroucki
Date: Mon Jul 25 04:32:36 2011
New Revision: 1150542

URL: http://svn.apache.org/viewvc?rev=1150542&view=rev
Log:
rpycservices: add liveCheck to NM rpcs

Modified:
    incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py

Modified: incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py?rev=1150542&r1=1150541&r2=1150542&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py (original)
+++ incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py Mon Jul 25 04:32:36 2011
@@ -3,7 +3,7 @@ from tashi.rpycservices.rpyctypes import
 import cPickle
 
 clusterManagerRPCs = ['createVm', 'shutdownVm', 'destroyVm', 'suspendVm', 'resumeVm', 'migrateVm', 'pauseVm', 'unpauseVm', 'getHosts', 'getNetworks', 'getUsers', 'getInstances', 'vmmSpecificCall', 'registerNodeManager', 'vmUpdate', 'activateVm', 'registerHost']
-nodeManagerRPCs = ['instantiateVm', 'shutdownVm', 'destroyVm', 'suspendVm', 'resumeVm', 'prepReceiveVm', 'prepSourceVm', 'migrateVm', 'receiveVm', 'pauseVm', 'unpauseVm', 'getVmInfo', 'listVms', 'vmmSpecificCall', 'getHostInfo']
+nodeManagerRPCs = ['instantiateVm', 'shutdownVm', 'destroyVm', 'suspendVm', 'resumeVm', 'prepReceiveVm', 'prepSourceVm', 'migrateVm', 'receiveVm', 'pauseVm', 'unpauseVm', 'getVmInfo', 'listVms', 'vmmSpecificCall', 'getHostInfo', 'liveCheck']
 
 def clean(args):
 	"""Cleans the object so cPickle can be used."""
@@ -49,9 +49,7 @@ class client:
 		def connectWrap(*args):
 			args = cPickle.dumps(clean(args))
 			try:
-				# XXXstroucki this is raising exception but not getting handled
 				res = getattr(self.conn.root, name)(args)
-				# XXXstroucki handle exception coming back
 			except Exception, e:
 				self.conn.close()
 				raise e