svn commit: r1351051 - in /incubator/tashi/trunk/src/tashi: client/tashi-client.py clustermanager/clustermanagerservice.py nodemanager/nodemanagerservice.py nodemanager/vmcontrol/qemu.py util.py

[st...@apache.org]

Author: stroucki
Date: Sun Jun 17 05:16:08 2012
New Revision: 1351051

URL: http://svn.apache.org/viewvc?rev=1351051&view=rev
Log:
Apply more pydev fixes

Modified:
    incubator/tashi/trunk/src/tashi/client/tashi-client.py
    incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
    incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py
    incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
    incubator/tashi/trunk/src/tashi/util.py

Modified: incubator/tashi/trunk/src/tashi/client/tashi-client.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/client/tashi-client.py?rev=1351051&r1=1351050&r2=1351051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/client/tashi-client.py (original)
+++ incubator/tashi/trunk/src/tashi/client/tashi-client.py Sun Jun 17 05:16:08 2012
@@ -63,7 +63,7 @@ def checkHid(host):
 			if (h.name == host):
 				hostId = h.id
 	if (hostId is None):
-		raise ValueError("Unknown host %s" % (str(instance)))
+		raise ValueError("Unknown host %s" % (str(host)))
 
 	# XXXstroucki permissions for host related stuff?
 	return hostId

Modified: incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py?rev=1351051&r1=1351050&r2=1351051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py Sun Jun 17 05:16:08 2012
@@ -309,7 +309,7 @@ class ClusterManagerService(object):
 					continue
 
 				# update the information we have on the vm
-				before = instance.state
+				#before = instance.state
 				rv = self.__vmUpdate(instance, newInstance, None)
 				if (rv == "release"):
 					self.data.releaseInstance(instance)

Modified: incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py?rev=1351051&r1=1351050&r2=1351051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py Sun Jun 17 05:16:08 2012
@@ -22,8 +22,6 @@ import time
 
 from tashi.rpycservices.rpyctypes import InstanceState, TashiException, Errors, Instance
 from tashi import boolean, vmStates, ConnectionManager
-import tashi
-
 
 class NodeManagerService(object):
 	"""RPC handler for the NodeManager

Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py?rev=1351051&r1=1351050&r2=1351051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py Sun Jun 17 05:16:08 2012
@@ -150,9 +150,8 @@ class Qemu(VmControlInterface):
 
 		for f in os.listdir("/proc"):
 			try:
-				# XXXstroucki: pydev complains about bin being built-in
-				bin = os.readlink("/proc/%s/exe" % (f))
-				if (bin.find(real_bin) != -1):
+				binary = os.readlink("/proc/%s/exe" % (f))
+				if (binary.find(real_bin) != -1):
 					pids.append(int(f))
 			except Exception:
 				pass

Modified: incubator/tashi/trunk/src/tashi/util.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/util.py?rev=1351051&r1=1351050&r2=1351051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/util.py (original)
+++ incubator/tashi/trunk/src/tashi/util.py Sun Jun 17 05:16:08 2012
@@ -191,6 +191,7 @@ def instantiateImplementation(className,
 		cmd = ""
 	cmd += "_obj = %s(*args)\n" % (className)
 	exec cmd in locals()
+	# XXXstroucki: this is correct, even though pydev complains
 	return _obj
 
 def convertExceptions(oldFunc):