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.namespace import *
from sfa.util.api import *
+from sfa.util.nodemanager import NodeManager
+from sfa.util.sfalogging import *
class GeniAPI(BaseAPI):
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 config is None:
return
- self.nodemanager = self.getNodeManagerShell()
-
- def getNodeManagerShell(self):
- # just import the nm api source
- sys.path.append('/usr/share/NodeManager')
- import api_calls
- return api_calls
-
+ self.nodemanager = NodeManager()
def sliver_exists(self):
sliver_dict = self.nodemanager.GetXIDs()