Merge remote-tracking branch 'origin/geni-v3' into geni-v3

diff --git a/sfa/planetlab/plshell.py b/sfa/planetlab/plshell.py
index 5162fe8..16af128 100644 (file)
--- a/sfa/planetlab/plshell.py
+++ b/sfa/planetlab/plshell.py
@@ -70,16 +70,16 @@ class PlShell:
         if is_local and plc_direct_access:
             logger.info('plshell access - capability')
             self.plauth = { 'AuthMethod': 'capability',
-                            'Username':   config.SFA_PLC_USER,
-                            'AuthString': config.SFA_PLC_PASSWORD,
+                            'Username':   str(config.SFA_PLC_USER),
+                            'AuthString': str(config.SFA_PLC_PASSWORD),
                             }
             self.proxy = PLC.Shell.Shell ()
 
         else:
             logger.info('plshell access - xmlrpc')
             self.plauth = { 'AuthMethod': 'password',
-                            'Username':   config.SFA_PLC_USER,
-                            'AuthString': config.SFA_PLC_PASSWORD,
+                            'Username':   str(config.SFA_PLC_USER),
+                            'AuthString': str(config.SFA_PLC_PASSWORD),
                             }
             self.proxy = xmlrpclib.Server(url, verbose = False, allow_none = True)
 
@@ -94,4 +94,3 @@ class PlShell:
             logger.debug('PlShell %s (%s) returned ... '%(name,actual_name))
             return result
         return func
-