X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fopenstackimporter.py;h=2bf1da310404232c8a94c38e3887d76148376ee0;hb=b7d6a80faf23cb019c74e65c2264e215446f84a3;hp=27d0344ee78863387249c3c339041c520618ebe6;hpb=f69270a701959bd4ed0604a7d4cb9093c0b23906;p=sfa.git diff --git a/sfa/importer/openstackimporter.py b/sfa/importer/openstackimporter.py index 27d0344e..2bf1da31 100644 --- 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 = {}