#
-# Geniwrapper XML-RPC and SOAP interfaces
+# SFA XML-RPC and SOAP interfaces
#
### $Id$
### $URL$
import traceback
import string
import xmlrpclib
-
from sfa.trust.auth import Auth
from sfa.util.config import *
from sfa.util.faults import *
from sfa.trust.rights import *
from sfa.trust.credential import *
from sfa.trust.certificate import *
-from sfa.util.misc import *
-from sfa.util.sfalogging import *
-from sfa.util.genitable import *
+from sfa.util.namespace import *
from sfa.util.api import *
+from sfa.util.nodemanager import NodeManager
+from sfa.util.sfalogging import *
+from sfa.util.table import SfaTable
-class GeniAPI(BaseAPI):
+class SfaAPI(BaseAPI):
# flat list of method names
import sfa.methods
def __init__(self, config = "/etc/sfa/sfa_config", encoding = "utf-8", methods='sfa.methods',
peer_cert = None, interface = None, key_file = None, cert_file = None):
BaseAPI.__init__(self, config=config, encoding=encoding, methods=methods, peer_cert=peer_cert,
- interface=interface, key_file=key_file, cert_file=cert_file):
+ interface=interface, key_file=key_file, cert_file=cert_file)
self.encoding = encoding
def getCredentialFromRegistry(self):
"""
- Get our credential from a remote registry using a geniclient connection
+ Get our credential from a remote registry
"""
type = 'authority'
path = self.config.SFA_DATA_DIR
from sfa.server.registry import Registries
registries = Registries(self)
registry = registries[self.hrn]
- cert_string=self.cert.save_to_string(save_parents=True)
+ cert_string=self.cert.save_to_string(save_parents=True)
# get self credential
- arg_list = [cert_string,type,self.hrn]
- request_hash=self.key.compute_hash(arg_list)
- self_cred = registry.get_self_credential(cert_string, type, self.hrn, request_hash)
+ self_cred = registry.get_self_credential(cert_string, type, self.hrn)
# get credential
- arg_list = [self_cred,type,self.hrn]
- request_hash=self.key.compute_hash(arg_list)
- cred = registry.get_credential(self_cred, type, self.hrn, request_hash)
+ cred = registry.get_credential(self_cred, type, self.hrn)
# save cred to file
Credential(string=cred).save_to_file(cred_filename, save_parents=True)
if not auth_hrn or hrn == self.config.SFA_INTERFACE_HRN:
auth_hrn = hrn
auth_info = self.auth.get_auth_info(auth_hrn)
- table = GeniTable()
+ table = SfaTable()
records = table.findObjects(hrn)
if not records:
raise RecordNotFound
self.credential = self.getCredentialFromRegistry()
##
- # Convert geni fields to PLC fields for use when registering up updating
+ # Convert SFA fields to PLC fields for use when registering up updating
# registry record in the PLC database
#
# @param type type of record (user, slice, ...)
# @param hrn human readable name
- # @param geni_fields dictionary of geni fields
+ # @param sfa_fields dictionary of SFA fields
# @param pl_fields dictionary of PLC fields (output)
- def geni_fields_to_pl_fields(self, type, hrn, record):
+ def sfa_fields_to_pl_fields(self, type, hrn, record):
def convert_ints(tmpdict, int_fields):
for field in int_fields:
pl_record["url"] = record["url"]
if "description" in record:
pl_record["description"] = record["description"]
+ if "expires" in record:
+ pl_record["expires"] = int(record["expires"])
elif type == "node":
if not "hostname" in pl_record:
if not "hostname" in record:
- raise MissingGeniInfo("hostname")
+ raise MissingSfaInfo("hostname")
pl_record["hostname"] = record["hostname"]
if not "model" in pl_record:
pl_record["model"] = "geni"
def fill_record_pl_info(self, record):
"""
- Fill in the planetlab specific fields of a Geni record. This
+ Fill in the planetlab specific fields of a SFA record. This
involves calling the appropriate PLC method to retrieve the
database record for the object.
elif (type == "node"):
pl_res = self.plshell.GetNodes(self.plauth, [pointer])
else:
- raise UnknownGeniType(type)
+ raise UnknownSfaType(type)
if not pl_res:
raise PlanetLabRecordDoesNotExist(record['hrn'])
- def fill_record_geni_info(self, record):
- geni_info = {}
+ def fill_record_sfa_info(self, record):
+ sfa_info = {}
type = record['type']
- table = GeniTable()
+ table = SfaTable()
if (type == "slice"):
person_ids = record.get("person_ids", [])
persons = table.find({'type': 'user', 'pointer': person_ids})
researchers = [person['hrn'] for person in persons]
- geni_info['researcher'] = researchers
+ sfa_info['researcher'] = researchers
elif (type == "authority"):
person_ids = record.get("person_ids", [])
if 'admin' in person['roles']:
admins.append(hrn)
- geni_info['PI'] = pis
- geni_info['operator'] = techs
- geni_info['owner'] = admins
+ sfa_info['PI'] = pis
+ sfa_info['operator'] = techs
+ sfa_info['owner'] = admins
# xxx TODO: OrganizationName
elif (type == "node"):
- geni_info['dns'] = record.get("hostname", "")
+ sfa_info['dns'] = record.get("hostname", "")
# xxx TODO: URI, LatLong, IP, DNS
elif (type == "user"):
- geni_info['email'] = record.get("email", "")
+ sfa_info['email'] = record.get("email", "")
# xxx TODO: PostalAddress, Phone
- record.update(geni_info)
+ record.update(sfa_info)
def fill_record_info(self, record):
"""
- Given a geni record, fill in the PLC specific and Geni specific
+ Given a SFA record, fill in the PLC specific and SFA specific
fields in the record.
"""
self.fill_record_pl_info(record)
- self.fill_record_geni_info(record)
+ self.fill_record_sfa_info(record)
def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc):
# get a list of the HRNs tht are members of the old and new records
# build a list of the new person ids, by looking up each person to get
# their pointer
newIdList = []
- table = GeniTable()
+ table = SfaTable()
records = table.find({'type': 'user', 'hrn': newList})
for rec in records:
newIdList.append(rec['pointer'])
if config is None:
return
- self.nodemanager = self.getNodeManagerShell()
-
- def getNodeManagerShell(self):
- # do we need an auth ?
- auth = {}
- try:
- nodemanager = xmlrpclib.ServerProxy('http://127.0.0.1:812')
- except:
- raise
-
- return nodemanager
+ self.nodemanager = NodeManager()
def sliver_exists(self):
sliver_dict = self.nodemanager.GetXIDs()
git://git.onelab.eu / sfa.git / blobdiff