incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1226333 - in /incubator/tashi: branches/stablefix/src/tashi/rpycservices/ branches/stablefix/src/zoni/services/ branches/stroucki-accounting/src/tashi/rpycservices/ branches/stroucki-accounting/src/zoni/services/ trunk/src/tashi/rpycservic...
Date Mon, 02 Jan 2012 03:03:22 GMT
Author: stroucki
Date: Mon Jan  2 03:03:21 2012
New Revision: 1226333

URL: http://svn.apache.org/viewvc?rev=1226333&view=rev
Log:
rpycservices: address rpyc-3.1.0 interface change


Modified:
    incubator/tashi/branches/stablefix/src/tashi/rpycservices/rpycservices.py
    incubator/tashi/branches/stablefix/src/zoni/services/rpycservices.py
    incubator/tashi/branches/stroucki-accounting/src/tashi/rpycservices/rpycservices.py
    incubator/tashi/branches/stroucki-accounting/src/zoni/services/rpycservices.py
    incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py
    incubator/tashi/trunk/src/zoni/services/rpycservices.py

Modified: incubator/tashi/branches/stablefix/src/tashi/rpycservices/rpycservices.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stablefix/src/tashi/rpycservices/rpycservices.py?rev=1226333&r1=1226332&r2=1226333&view=diff
==============================================================================
--- incubator/tashi/branches/stablefix/src/tashi/rpycservices/rpycservices.py (original)
+++ incubator/tashi/branches/stablefix/src/tashi/rpycservices/rpycservices.py Mon Jan  2 03:03:21
2012
@@ -43,7 +43,7 @@ def clean(args):
 
 class client:
 	def __init__(self, host, port, username=None, password=None):
-		"""Client for ManagerService. If username and password are provided, rpyc.tls_connect will
be used to connect, else rpyc.connect will be used."""
+		"""Client for ManagerService. If username and password are provided, rpyc.tlslite_connect
will be used to connect, else rpyc.connect will be used."""
 		self.host = host
 		self.port = int(port)
 		self.username = username
@@ -53,7 +53,7 @@ class client:
 	def createConn(self):
 		"""Creates a rpyc connection."""
 		if self.username != None and self.password != None:
-			return rpyc.tls_connect(host=self.host, port=self.port, username=self.username, password=self.password)
+			return rpyc.tlslite_connect(host=self.host, port=self.port, username=self.username, password=self.password)
 		else:
 			return rpyc.connect(host=self.host, port=self.port)
 

Modified: incubator/tashi/branches/stablefix/src/zoni/services/rpycservices.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stablefix/src/zoni/services/rpycservices.py?rev=1226333&r1=1226332&r2=1226333&view=diff
==============================================================================
--- incubator/tashi/branches/stablefix/src/zoni/services/rpycservices.py (original)
+++ incubator/tashi/branches/stablefix/src/zoni/services/rpycservices.py Mon Jan  2 03:03:21
2012
@@ -27,7 +27,7 @@ hardwareRPCs = ['getPowerStatus']
 
 class client:
 	def __init__(self, host, port, username=None, password=None):
-		"""Client for ManagerService. If username and password are provided, rpyc.tls_connect will
be used to connect, else rpyc.connect will be used."""
+		"""Client for ManagerService. If username and password are provided, rpyc.tlslite_connect
will be used to connect, else rpyc.connect will be used."""
 		self.host = host
 		self.port = int(port)
 		self.username = username
@@ -37,7 +37,7 @@ class client:
 	def createConn(self):
 		"""Creates a rpyc connection."""
 		if self.username != None and self.password != None:
-			return rpyc.tls_connect(host=self.host, port=self.port, username=self.username, password=self.password)
+			return rpyc.tlslite_connect(host=self.host, port=self.port, username=self.username, password=self.password)
 		else:
 			return rpyc.connect(host=self.host, port=self.port)
 

Modified: incubator/tashi/branches/stroucki-accounting/src/tashi/rpycservices/rpycservices.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-accounting/src/tashi/rpycservices/rpycservices.py?rev=1226333&r1=1226332&r2=1226333&view=diff
==============================================================================
--- incubator/tashi/branches/stroucki-accounting/src/tashi/rpycservices/rpycservices.py (original)
+++ incubator/tashi/branches/stroucki-accounting/src/tashi/rpycservices/rpycservices.py Mon
Jan  2 03:03:21 2012
@@ -43,7 +43,7 @@ def clean(args):
 
 class client:
 	def __init__(self, host, port, username=None, password=None):
-		"""Client for ManagerService. If username and password are provided, rpyc.tls_connect will
be used to connect, else rpyc.connect will be used."""
+		"""Client for ManagerService. If username and password are provided, rpyc.tlslite_connect
will be used to connect, else rpyc.connect will be used."""
 		self.host = host
 		self.port = int(port)
 		self.username = username
@@ -53,7 +53,7 @@ class client:
 	def createConn(self):
 		"""Creates a rpyc connection."""
 		if self.username != None and self.password != None:
-			return rpyc.tls_connect(host=self.host, port=self.port, username=self.username, password=self.password)
+			return rpyc.tlslite_connect(host=self.host, port=self.port, username=self.username, password=self.password)
 		else:
 			return rpyc.connect(host=self.host, port=self.port)
 

Modified: incubator/tashi/branches/stroucki-accounting/src/zoni/services/rpycservices.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-accounting/src/zoni/services/rpycservices.py?rev=1226333&r1=1226332&r2=1226333&view=diff
==============================================================================
--- incubator/tashi/branches/stroucki-accounting/src/zoni/services/rpycservices.py (original)
+++ incubator/tashi/branches/stroucki-accounting/src/zoni/services/rpycservices.py Mon Jan
 2 03:03:21 2012
@@ -27,7 +27,7 @@ hardwareRPCs = ['getPowerStatus']
 
 class client:
 	def __init__(self, host, port, username=None, password=None):
-		"""Client for ManagerService. If username and password are provided, rpyc.tls_connect will
be used to connect, else rpyc.connect will be used."""
+		"""Client for ManagerService. If username and password are provided, rpyc.tlslite_connect
will be used to connect, else rpyc.connect will be used."""
 		self.host = host
 		self.port = int(port)
 		self.username = username
@@ -37,7 +37,7 @@ class client:
 	def createConn(self):
 		"""Creates a rpyc connection."""
 		if self.username != None and self.password != None:
-			return rpyc.tls_connect(host=self.host, port=self.port, username=self.username, password=self.password)
+			return rpyc.tlslite_connect(host=self.host, port=self.port, username=self.username, password=self.password)
 		else:
 			return rpyc.connect(host=self.host, port=self.port)
 

Modified: incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py?rev=1226333&r1=1226332&r2=1226333&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py (original)
+++ incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py Mon Jan  2 03:03:21 2012
@@ -43,7 +43,7 @@ def clean(args):
 
 class client:
 	def __init__(self, host, port, username=None, password=None):
-		"""Client for ManagerService. If username and password are provided, rpyc.tls_connect will
be used to connect, else rpyc.connect will be used."""
+		"""Client for ManagerService. If username and password are provided, rpyc.tlslite_connect
will be used to connect, else rpyc.connect will be used."""
 		self.host = host
 		self.port = int(port)
 		self.username = username
@@ -53,7 +53,7 @@ class client:
 	def createConn(self):
 		"""Creates a rpyc connection."""
 		if self.username != None and self.password != None:
-			return rpyc.tls_connect(host=self.host, port=self.port, username=self.username, password=self.password)
+			return rpyc.tlslite_connect(host=self.host, port=self.port, username=self.username, password=self.password)
 		else:
 			return rpyc.connect(host=self.host, port=self.port)
 

Modified: incubator/tashi/trunk/src/zoni/services/rpycservices.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/zoni/services/rpycservices.py?rev=1226333&r1=1226332&r2=1226333&view=diff
==============================================================================
--- incubator/tashi/trunk/src/zoni/services/rpycservices.py (original)
+++ incubator/tashi/trunk/src/zoni/services/rpycservices.py Mon Jan  2 03:03:21 2012
@@ -27,7 +27,7 @@ hardwareRPCs = ['getPowerStatus']
 
 class client:
 	def __init__(self, host, port, username=None, password=None):
-		"""Client for ManagerService. If username and password are provided, rpyc.tls_connect will
be used to connect, else rpyc.connect will be used."""
+		"""Client for ManagerService. If username and password are provided, rpyc.tlslite_connect
will be used to connect, else rpyc.connect will be used."""
 		self.host = host
 		self.port = int(port)
 		self.username = username
@@ -37,7 +37,7 @@ class client:
 	def createConn(self):
 		"""Creates a rpyc connection."""
 		if self.username != None and self.password != None:
-			return rpyc.tls_connect(host=self.host, port=self.port, username=self.username, password=self.password)
+			return rpyc.tlslite_connect(host=self.host, port=self.port, username=self.username, password=self.password)
 		else:
 			return rpyc.connect(host=self.host, port=self.port)
 



Mime
View raw message