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
moved sfa/util/plxrn as sfa/planetlab/plxrn
[sfa.git]
/
sfa
/
importer
/
openstackimporter.py
diff --git
a/sfa/importer/openstackimporter.py
b/sfa/importer/openstackimporter.py
index
27d0344
..
b12ef03
100644
(file)
--- a/
sfa/importer/openstackimporter.py
+++ b/
sfa/importer/openstackimporter.py
@@
-2,15
+2,14
@@
import os
from sfa.util.config import Config
from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn
from sfa.util.config import Config
from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn
-from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename
from sfa.trust.gid import create_uuid
from sfa.trust.certificate import convert_public_key, Keypair
from sfa.trust.gid import create_uuid
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 OpenstackShell
+from sfa.planetlab.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn
+from sfa.openstack.nova_shell import NovaShell
def load_keys(filename):
keys = {}
def load_keys(filename):
keys = {}
@@
-34,18
+33,18
@@
class OpenstackImporter:
self.auth_hierarchy = auth_hierarchy
self.logger=logger
self.auth_hierarchy = auth_hierarchy
self.logger=logger
- def
recor
d_options (self, parser):
- self.logger.debug ("
PlImporter
no options yet")
+ def
ad
d_options (self, parser):
+ self.logger.debug ("
OpenstackImporter:
no options yet")
pass
def run (self, options):
# we don't have any options for now
pass
def run (self, options):
# we don't have any options for now
- self.logger.info ("
Pl
Importer.run : to do")
+ self.logger.info ("
Openstack
Importer.run : to do")
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 = {}
@@
-56,7
+55,7
@@
class OpenstackImporter:
existing_hrns.append(record.hrn)
# Get all users
existing_hrns.append(record.hrn)
# Get all users
- persons = shell.
user_get_all
()
+ persons = shell.
auth_manager.get_users
()
persons_dict = {}
keys_filename = config.config_path + os.sep + 'person_keys.py'
old_person_keys = load_keys(keys_filename)
persons_dict = {}
keys_filename = config.config_path + os.sep + 'person_keys.py'
old_person_keys = load_keys(keys_filename)
@@
-65,7
+64,7
@@
class OpenstackImporter:
hrn = config.SFA_INTERFACE_HRN + "." + person.id
persons_dict[hrn] = person
old_keys = old_person_keys.get(person.id, [])
hrn = config.SFA_INTERFACE_HRN + "." + person.id
persons_dict[hrn] = person
old_keys = old_person_keys.get(person.id, [])
- keys = [k.public_key for k in shell.key_pair_get_all_by_user(person.id)]
+ keys = [k.public_key for k in shell.
db.
key_pair_get_all_by_user(person.id)]
person_keys[person.id] = keys
update_record = False
if old_keys != keys:
person_keys[person.id] = keys
update_record = False
if old_keys != keys:
@@
-78,12
+77,12
@@
class OpenstackImporter:
try:
pkey = convert_public_key(keys[0])
except:
try:
pkey = convert_public_key(keys[0])
except:
- logger.log_exc('unable to convert public key for %s' % hrn)
+
self.
logger.log_exc('unable to convert public key for %s' % hrn)
pkey = Keypair(create=True)
else:
pkey = Keypair(create=True)
else:
- logger.warn("OpenstackImporter: person %s does not have a PL public key"%hrn)
+
self.
logger.warn("OpenstackImporter: person %s does not have a PL public key"%hrn)
pkey = Keypair(create=True)
pkey = Keypair(create=True)
- person_gid = s
faImporter.AuthH
ierarchy.create_gid(urn, create_uuid(), pkey)
+ person_gid = s
elf.auth_h
ierarchy.create_gid(urn, create_uuid(), pkey)
person_record = RegUser ()
person_record.type='user'
person_record.hrn=hrn
person_record = RegUser ()
person_record.type='user'
person_record.hrn=hrn
@@
-91,10
+90,10
@@
class OpenstackImporter:
person_record.authority=get_authority(hrn)
dbsession.add(person_record)
dbsession.commit()
person_record.authority=get_authority(hrn)
dbsession.add(person_record)
dbsession.commit()
- logger.info("OpenstackImporter: imported person %s" % person_record)
+
self.
logger.info("OpenstackImporter: imported person %s" % person_record)
# Get all projects
# Get all projects
- projects = shell.
project_get_all
()
+ projects = shell.
auth_manager.get_projects
()
projects_dict = {}
for project in projects:
hrn = config.SFA_INTERFACE_HRN + '.' + project.id
projects_dict = {}
for project in projects:
hrn = config.SFA_INTERFACE_HRN + '.' + project.id
@@
-103,7
+102,7
@@
class OpenstackImporter:
(hrn, 'slice') not in existing_records:
pkey = Keypair(create=True)
urn = hrn_to_urn(hrn, 'slice')
(hrn, 'slice') not in existing_records:
pkey = Keypair(create=True)
urn = hrn_to_urn(hrn, 'slice')
- project_gid = s
faImporter.AuthH
ierarchy.create_gid(urn, create_uuid(), pkey)
+ project_gid = s
elf.auth_h
ierarchy.create_gid(urn, create_uuid(), pkey)
project_record = RegSlice ()
project_record.type='slice'
project_record.hrn=hrn
project_record = RegSlice ()
project_record.type='slice'
project_record.hrn=hrn
@@
-111,7
+110,7
@@
class OpenstackImporter:
project_record.authority=get_authority(hrn)
dbsession.add(project_record)
dbsession.commit()
project_record.authority=get_authority(hrn)
dbsession.add(project_record)
dbsession.commit()
- logger.info("OpenstackImporter: imported slice: %s" % project_record)
+
self.
logger.info("OpenstackImporter: imported slice: %s" % project_record)
# remove stale records
system_records = [interface_hrn, root_auth, interface_hrn + '.slicemanager']
# remove stale records
system_records = [interface_hrn, root_auth, interface_hrn + '.slicemanager']
@@
-133,11
+132,11
@@
class OpenstackImporter:
continue
record_object = existing_records[ (record_hrn, type) ]
continue
record_object = existing_records[ (record_hrn, type) ]
- logger.info("OpenstackImporter: removing %s " % record)
+
self.
logger.info("OpenstackImporter: removing %s " % record)
dbsession.delete(record_object)
dbsession.commit()
# save pub keys
dbsession.delete(record_object)
dbsession.commit()
# save pub keys
- logger.info('OpenstackImporter: saving current pub keys')
+
self.
logger.info('OpenstackImporter: saving current pub keys')
save_keys(keys_filename, person_keys)
save_keys(keys_filename, person_keys)