Merge branch 'master' into sqlalchemy

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

diff --git a/sfa/importer/openstackimporter.py b/sfa/importer/openstackimporter.py
index 27d0344..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 = {}