git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into sqlalchemy
[sfa.git]
/
sfa
/
importer
/
openstackimporter.py
diff --git
a/sfa/importer/openstackimporter.py
b/sfa/importer/openstackimporter.py
index
844980d
..
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.storage.alchemy import dbsession
from sfa.storage.model import RegRecord, RegAuthority, RegUser, RegSlice, RegNode
-from sfa.openstack.
openstack_shell import Openstack
Shell
+from sfa.openstack.
nova_shell import Nova
Shell
def load_keys(filename):
keys = {}
def load_keys(filename):
keys = {}
@@
-45,7
+45,7
@@
class OpenstackImporter:
config = Config ()
interface_hrn = config.SFA_INTERFACE_HRN
root_auth = config.SFA_REGISTRY_ROOT_AUTH
config = Config ()
interface_hrn = config.SFA_INTERFACE_HRN
root_auth = config.SFA_REGISTRY_ROOT_AUTH
- shell =
Openstack
Shell (config)
+ shell =
Nova
Shell (config)
# create dict of all existing sfa records
existing_records = {}
# create dict of all existing sfa records
existing_records = {}