- self.logger.warn("OpenstackImporter: person %s does not have a PL public key"%hrn)
- pkey = Keypair(create=True)
- user_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
- user_record = RegUser ()
- user_record.type='user'
- user_record.hrn=hrn
- user_record.gid=user_gid
- user_record.authority=get_authority(hrn)
- dbsession.add(user_record)
- dbsession.commit()
- self.logger.info("OpenstackImporter: imported person %s" % user_record)
-
- # Get all tenants
- # A tenant can represent an organizational group (site) or a
- # slice. If a tenant's authorty/parent matches the root authority it is
- # considered a group/site. All other tenants are considered slices.
- tenants = shell.auth_manager.tenants.list()
+ self.logger.warn(
+ "OpenstackImporter: person %s does not have a PL public key" % hrn)
+ pkey = Keypair(create=True)
+ user_gid = self.auth_hierarchy.create_gid(
+ urn, create_uuid(), pkey, email=user.email)
+ user_record = RegUser()
+ user_record.type = 'user'
+ user_record.hrn = hrn
+ user_record.gid = user_gid
+ user_record.authority = get_authority(hrn)
+ global_dbsession.add(user_record)
+ global_dbsession.commit()
+ self.logger.info(
+ "OpenstackImporter: imported person %s" % user_record)
+
+ return users_dict, user_keys
+
+ def import_tenants(self, existing_hrns, existing_records):
+ # Get all tenants
+ # A tenant can represent an organizational group (site) or a
+ # slice. If a tenant's authorty/parent matches the root authority it is
+ # considered a group/site. All other tenants are considered slices.
+ tenants = self.shell.auth_manager.tenants.list()