using sfa.util.namespace instead of sfa.util.misc

[sfa.git] / sfa / plc / api.py

diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index 5612d89..f35ec42 100644 (file)
--- a/sfa/plc/api.py
+++ b/sfa/plc/api.py
@@ -10,7 +10,6 @@ import os
 import traceback
 import string
 import xmlrpclib
-
 from sfa.trust.auth import Auth
 from sfa.util.config import *
 from sfa.util.faults import *
@@ -18,10 +17,10 @@ from sfa.util.debug 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 *
 
 class GeniAPI(BaseAPI):
 
@@ -114,15 +113,11 @@ 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)
@@ -140,6 +135,7 @@ class GeniAPI(BaseAPI):
         if not auth_hrn or hrn == self.config.SFA_INTERFACE_HRN:
             auth_hrn = hrn
         auth_info = self.auth.get_auth_info(auth_hrn)
+        from sfa.util.genitable import GeniTable
         table = GeniTable()
         records = table.findObjects(hrn)
         if not records:
@@ -313,6 +309,7 @@ class GeniAPI(BaseAPI):
     def fill_record_geni_info(self, record):
         geni_info = {}
         type = record['type']
+        from sfa.util.genitable import GeniTable
         table = GeniTable()
         if (type == "slice"):
             person_ids = record.get("person_ids", [])
@@ -380,6 +377,7 @@ class GeniAPI(BaseAPI):
         # build a list of the new person ids, by looking up each person to get
         # their pointer
         newIdList = []
+        from sfa.util.genitable import GeniTable
         table = GeniTable()
         records = table.find({'type': 'user', 'hrn': newList})
         for rec in records:
@@ -429,14 +427,7 @@ class ComponentAPI(BaseAPI):
         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()