Removed a debugging statement

[sfa.git] / sfa / client / sfi.py

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 3188e9a..b3dbf35 100755 (executable)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -13,10 +13,9 @@ from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
 from sfa.util.geniclient import GeniClient
 from sfa.util.record import *
-from sfa.util.rspec import Rspec
+from sfa.util.rspec import RSpec
 from sfa.util.xmlrpcprotocol import ServerException
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
 from sfa.util.config import Config
 
 class Sfi:
@@ -95,9 +94,10 @@ class Sfi:
        self.cert_file = cert_file
        self.cert = Certificate(filename=cert_file) 
        # Establish connection to server(s)
-       self.slicemgr = GeniClient(sm_url, key_file, cert_file, self.options.protocol)
+       #self.slicemgr = GeniClient(sm_url, key_file, cert_file, self.options.protocol)
        #self.registry = GeniClient(reg_url, key_file, cert_file, self.options.protocol)
        self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file)  
+       self.slicemgr = xmlrpcprotocol.get_server(sm_url, key_file, cert_file)  
        return
     
     #
@@ -158,23 +158,24 @@ class Sfi:
             return gid       
  
     def get_user_cred(self):
-       file = os.path.join(self.options.sfi_dir, self.get_leaf(self.user) + ".cred")
-       if (os.path.isfile(file)):
-          user_cred = Credential(filename=file)
-          return user_cred
-       else:
-          # bootstrap user credential
-          request_hash = self.key.compute_hash([None, "user", self.user])
-          user_cred = self.registry.get_credential(None, "user", self.user, request_hash)
-          if user_cred:
-             cred = Credential(string=user_cred)
-             cred.save_to_file(file, save_parents=True)
-             if self.options.verbose:
-                print "Writing user credential to", file
-             return cred
-          else:
-             print "Failed to get user credential"
-             sys.exit(-1)
+        file = os.path.join(self.options.sfi_dir, self.get_leaf(self.user) + ".cred")
+        if (os.path.isfile(file)):
+            user_cred = Credential(filename=file)
+            return user_cred
+        else:
+            # bootstrap user credential
+            cert_string = self.cert.save_to_string(save_parents=True)
+            request_hash = self.key.compute_hash([cert_string, "user", self.user])
+            user_cred = self.registry.get_self_credential(cert_string, "user", self.user, request_hash)
+            if user_cred:
+               cred = Credential(string=user_cred)
+               cred.save_to_file(file, save_parents=True)
+               if self.options.verbose:
+                    print "Writing user credential to", file
+               return cred
+            else:
+               print "Failed to get user credential"
+               sys.exit(-1)
     
     def get_auth_cred(self):
     
@@ -208,9 +209,12 @@ class Sfi:
           return slice_cred
        else:
           # bootstrap slice credential from user credential
-          user_cred = self.get_user_cred()
-          slice_cred = self.registry.get_credential(user_cred, "slice", name)
+          user_cred = self.get_user_cred().save_to_string(save_parents=True)
+          arg_list = [user_cred, "slice", name]
+          request_hash = self.key.compute_hash(arg_list)  
+          slice_cred_str = self.registry.get_credential(user_cred, "slice", name, request_hash)
           if slice_cred:
+             slice_cred = Credential(string=slice_cred_str)
              slice_cred.save_to_file(file, save_parents=True)
              if self.options.verbose:
                 print "Writing slice credential to", file
@@ -687,7 +691,7 @@ class Sfi:
     
     def display_rspec(self,rspec, format = 'rspec'):
         if format in ['dns']:
-            spec = Rspec()
+            spec = RSpec()
             spec.parseString(rspec)
             hostnames = []
             nodespecs = spec.getDictsByTagName('NodeSpec')
@@ -699,7 +703,7 @@ class Sfi:
                         hostnames.append(nodespec['name'])
             result = hostnames
         elif format in ['ip']:
-            spec = Rspec()
+            spec = RSpec()
             spec.parseString(rspec)
             ips = []
             ifspecs = spec.getDictsByTagName('IfSpec')