From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Thu, 7 Nov 2013 18:22:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: geni-v2-broken-and-discontinued~17
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ff3cb373d1842cd52fcb387d57334a49cc56df69;hp=-c;p=sfa.git

Merge branch 'master' of ssh://git.onelab.eu/git/sfa
---

ff3cb373d1842cd52fcb387d57334a49cc56df69
diff --combined sfa/planetlab/plshell.py
index 12b136c6,42349f0f..f860458d
--- a/sfa/planetlab/plshell.py
+++ b/sfa/planetlab/plshell.py
@@@ -28,11 -28,7 +28,11 @@@ class PlShell
                      'AddLeases',
                      # HRN management methods
                      'SetPersonHrn', 'GetPersonHrn', 'SetSliceHrn', 'GetSliceHrn',
 -                    'SetNodeHrn', 'GetNodeHrn' 
 +                    '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',
@@@ -68,7 -64,7 +68,7 @@@
              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,
@@@ -76,7 -72,7 +76,7 @@@
              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,