PlShell reference belongs in sfa-import-plc

diff --git a/sfa/importer/sfa-import-plc.py b/sfa/importer/sfa-import-plc.py
index d827396..ea5d2cd 100755 (executable)
--- a/sfa/importer/sfa-import-plc.py
+++ b/sfa/importer/sfa-import-plc.py
@@ -27,6 +27,7 @@ from sfa.trust.gid import create_uuid
 from sfa.trust.certificate import convert_public_key, Keypair
 from sfa.importer.sfaImport import sfaImport, _cleanup_string
 from sfa.util.sfalogging import logger
+from sfa.plc.plshell import PlShell    
 
 def process_options():
 
@@ -75,7 +76,7 @@ def main():
     sfaImporter.create_top_level_records()
     logger=sfaImporter.logger
     logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
-    shell = sfaImporter.shell
+    shell = PlShell (config)
     
     # special case for vini
     if ".vini" in interface_hrn and interface_hrn.endswith('vini'):

diff --git a/sfa/importer/sfaImport.py b/sfa/importer/sfaImport.py
index 68cd195..6cb47f5 100644 (file)
--- a/sfa/importer/sfaImport.py
+++ b/sfa/importer/sfaImport.py
@@ -54,10 +54,6 @@ class sfaImport:
        self.config = Config()
        self.TrustedRoots = TrustedRoots(Config.get_trustedroots_dir(self.config))
        self.root_auth = self.config.SFA_REGISTRY_ROOT_AUTH
-       # should use a driver instead...
-       from sfa.plc.plshell import PlShell
-       # how to connect to planetlab 
-       self.shell = PlShell (self.config)
 
     def create_top_level_records(self):
         """