2to3 -f raise

[sfa.git] / sfa / planetlab / plshell.py

diff --git a/sfa/planetlab/plshell.py b/sfa/planetlab/plshell.py
index d2cd9cd..15c58b6 100644 (file)
--- a/sfa/planetlab/plshell.py
+++ b/sfa/planetlab/plshell.py
@@ -23,6 +23,16 @@ class PlShell:
                     'UpdateSlice', 'UpdateSliceTag',
                     # also used as-is in importer
                     'GetSites','GetNodes',
+                    # Lease management methods
+                    'GetLeases', 'GetLeaseGranularity', 'DeleteLeases','UpdateLeases',
+                    'AddLeases',
+                    # HRN management methods
+                    'SetPersonHrn', 'GetPersonHrn', 'SetSliceHrn', 'GetSliceHrn',
+                    'SetNodeHrn', 'GetNodeHrn', 'GetSiteHrn', 'SetSiteHrn',
+                    # Tag slice/person/site created by SFA
+                    'SetPersonSfaCreated', 'GetPersonSfaCreated', 'SetSliceSfaCreated',
+                    'GetSliceSfaCreated', 'SetNodeSfaCreated', 'GetNodeSfaCreated',
+                    'GetSiteSfaCreated', 'SetSiteSfaCreated', 
                     ]
     # support for other names - this is experimental
     alias_calls = { 'get_authorities':'GetSites',
@@ -58,18 +68,18 @@ class PlShell:
             except:
                 plc_direct_access=False
         if is_local and plc_direct_access:
-            logger.debug('plshell access - capability')
+            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.debug('plshell access - xmlrpc')
+            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)
 
@@ -79,7 +89,7 @@ class PlShell:
             if name in PlShell.direct_calls: actual_name=name
             if name in PlShell.alias_calls: actual_name=PlShell.alias_calls[name]
             if not actual_name:
-                raise Exception, "Illegal method call %s for PL driver"%(name)
+                raise Exception("Illegal method call %s for PL driver"%(name))
             result=getattr(self.proxy, actual_name)(self.plauth, *args, **kwds)
             logger.debug('PlShell %s (%s) returned ... '%(name,actual_name))
             return result