Merge branch 'master' into sqlalchemy

[sfa.git] / sfa / importer / openstackimporter.py

diff --git a/sfa/importer/openstackimporter.py b/sfa/importer/openstackimporter.py
index 33543f3..2bf1da3 100644 (file)
--- a/sfa/importer/openstackimporter.py
+++ b/sfa/importer/openstackimporter.py
@@ -10,7 +10,7 @@ from sfa.trust.certificate import convert_public_key, Keypair
 from sfa.storage.alchemy import dbsession
 from sfa.storage.model import RegRecord, RegAuthority, RegUser, RegSlice, RegNode
 
-from sfa.openstack.openstack_shell import OpenstackShell    
+from sfa.openstack.nova_shell import NovaShell    
 
 def load_keys(filename):
     keys = {}
@@ -34,8 +34,8 @@ class OpenstackImporter:
         self.auth_hierarchy = auth_hierarchy
         self.logger=logger
 
-    def record_options (self, parser):
-        self.logger.debug ("PlImporter no options yet")
+    def add_options (self, parser):
+        self.logger.debug ("OpenstackImporter: no options yet")
         pass
 
     def run (self, options):
@@ -45,7 +45,7 @@ class OpenstackImporter:
         config = Config ()
         interface_hrn = config.SFA_INTERFACE_HRN
         root_auth = config.SFA_REGISTRY_ROOT_AUTH
-        shell = OpenstackShell (config)
+        shell = NovaShell (config)
 
         # create dict of all existing sfa records
         existing_records = {}
@@ -81,7 +81,7 @@ class OpenstackImporter:
                         logger.log_exc('unable to convert public key for %s' % hrn)
                         pkey = Keypair(create=True)
                 else:
-                    logger.warn("Import: person %s does not have a PL public key"%hrn)
+                    logger.warn("OpenstackImporter: person %s does not have a PL public key"%hrn)
                     pkey = Keypair(create=True) 
                 person_gid = sfaImporter.AuthHierarchy.create_gid(urn, create_uuid(), pkey)
                 person_record = RegUser ()
@@ -91,7 +91,7 @@ class OpenstackImporter:
                 person_record.authority=get_authority(hrn)
                 dbsession.add(person_record)
                 dbsession.commit()
-                logger.info("Import: imported person %s" % person_record)
+                logger.info("OpenstackImporter: imported person %s" % person_record)
 
         # Get all projects
         projects = shell.project_get_all()
@@ -111,7 +111,7 @@ class OpenstackImporter:
                 project_record.authority=get_authority(hrn)
                 dbsession.add(project_record)
                 dbsession.commit()
-                logger.info("Import: imported slice: %s" % project_record)  
+                logger.info("OpenstackImporter: imported slice: %s" % project_record)  
     
         # remove stale records    
         system_records = [interface_hrn, root_auth, interface_hrn + '.slicemanager']
@@ -133,11 +133,11 @@ class OpenstackImporter:
                 continue 
         
             record_object = existing_records[ (record_hrn, type) ]
-            logger.info("Import: removing %s " % record)
+            logger.info("OpenstackImporter: removing %s " % record)
             dbsession.delete(record_object)
             dbsession.commit()
                                    
         # save pub keys
-        logger.info('Import: saving current pub keys')
+        logger.info('OpenstackImporter: saving current pub keys')
         save_keys(keys_filename, person_keys)