'sfa/client',
'sfa/methods',
'sfa/plc',
+ 'sfa/senslab',
'sfa/server',
'sfa/trust',
'sfa/util',
import getopt
import sys
import tempfile
-
-from sfa.util.sfalogging import sfa_logger_goes_to_import,sfa_logger
+from sfa.util.sfalogging import _SfaLogger
+#from sfa.util.sfalogging import sfa_logger_goes_to_import,sfa_logger
from sfa.util.record import *
from sfa.util.table import SfaTable
from sfa.util.plxrn import email_to_hrn
from sfa.util.config import Config
from sfa.trust.certificate import convert_public_key, Keypair
-from sfa.trust.trustedroot import *
+from sfa.trust.trustedroots import *
from sfa.trust.hierarchy import *
from sfa.trust.gid import create_uuid
class SenslabImport:
def __init__(self):
- sfa_logger_goes_to_import()
- self.logger = sfa_logger()
+ self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
+
+ #sfa_logger_goes_to_import()
+ #self.logger = sfa_logger()
self.AuthHierarchy = Hierarchy()
self.config = Config()
- self.TrustedRoots = TrustedRootList(Config.get_trustedroots_dir(self.config))
+ self.TrustedRoots = TrustedRoots(Config.get_trustedroots_dir(self.config))
print>>sys.stderr, "\r\n ========= \t\t SenslabImport TrustedRoots\r\n" , self.TrustedRoots
self.plc_auth = self.config.get_plc_auth()
print>>sys.stderr, "\r\n ========= \t\t SenslabImport self.plc_auth %s \r\n" %(self.plc_auth )
from sfa.util.faults import *
from sfa.util.api import *
from sfa.util.config import *
-from sfa.util.sfalogging import sfa_logger
+from sfa.util.sfalogging import logger
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
from sfa.trust.auth import Auth
from sfa.trust.rights import Right, Rights, determine_rights
self.users = SenslabImportUsers()
self.hrn = self.config.SFA_INTERFACE_HRN
self.time_format = "%Y-%m-%d %H:%M:%S"
- self.logger=sfa_logger()
+ #self.logger=sfa_logger()
print >>sys.stderr, "\r\n \t\t___________PLC/API.PY __init__ STOP ",self.interface #dir(self)
if record['type'] == 'user':
if 'key_ids' not in record:
print>>sys.stderr, " NO_KEY_IDS fill_record_pl_info key_ids record: %s" %(record)
+ logger.info("user record has no 'key_ids' - need to import ?")
else:
pubkeys = [keys[key_id]['key'] for key_id in record['key_ids'] if key_id in keys]
record['keys'] = pubkeys
from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename
from sfa.util.config import Config
from sfa.trust.certificate import convert_public_key, Keypair
-from sfa.trust.trustedroot import *
+from sfa.trust.trustedroots import *
from sfa.trust.hierarchy import *
from sfa.util.xrn import Xrn
from sfa.trust.gid import create_uuid