from geni.util.debug import *
from geni.util.rights import *
from geni.util.credential import *
+from geni.util.misc import *
# See "2.2 Characters" in the XML specification:
#
def getPLCShell(self):
self.plauth = {'Username': self.config.GENI_PLC_USER,
'AuthMethod': 'password',
- 'AuthString': self.config.GENI_PLC_PASSWORD}
+ 'AuthString': self.config.GENI_PLC_PASSWORD}
try:
import PLC.Shell
shell = PLC.Shell.Shell(globals = globals())
credential = Credential(filename = cred_filename)
return credential
except IOError:
- from geni.util.registry import Registries
- registries = Registries()
+ from geni.registry import Registries
+ registries = Registries(self)
registry = registries[self.hrn]
self_cred = registry.get_credential(None, type, self.hrn)
cred = registry.get_credential(self_cred, type, self.hrn)
# their pointer
newIdList = []
for hrn in newList:
- userRecord = self.resolve_raw("user", hrn)[0]
- newIdList.append(userRecord.get_pointer())
+ auth_hrn = self.auth.get_authority(hrn)
+ if not auth_hrn:
+ auth_hrn = hrn
+ auth_info = self.auth.get_auth_info(auth_hrn)
+ table = self.auth.get_auth_table(auth_hrn)
+ records = table.resolve('user', hrn)
+ if records:
+ userRecord = records[0]
+ newIdList.append(userRecord.get_pointer())
# build a list of the old person ids from the person_ids field of the
# pl_info