CreateSliver returns the allocated rspec

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

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index cfa87c8..96bf4bf 100755 (executable)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -126,8 +126,7 @@ class Sfi:
     hashrequest = False
    
     def create_cmd_parser(self, command, additional_cmdargs=None):
-        cmdargs = {"gid": "",
-                  "list": "name",
+        cmdargs = {"list": "name",
                   "show": "name",
                   "remove": "name",
                   "add": "record",
@@ -367,21 +366,6 @@ class Sfi:
           cert.save_to_file(file)
           return file
    
-    def get_gid(self):
-        #file = os.path.join(self.options.sfi_dir, get_leaf(self.user) + ".gid")
-        file = os.path.join(self.options.sfi_dir, self.user.replace(self.authority + '.', '') + ".gid")
-        if (os.path.isfile(file)):
-            gid = GID(filename=file)
-            return gid
-        else:
-            cert_str = self.cert.save_to_string(save_parents=True)
-            gid_str = self.registry.get_gid(cert_str, self.user, "user")
-            gid = GID(string=gid_str)
-            if self.options.verbose:
-                print "Writing user gid to", file
-            gid.save_to_file(file, save_parents=True)
-            return gid       
-
     def get_cached_credential(self, file):
         """
         Return a cached credential only if it hasn't expired.
@@ -518,11 +502,6 @@ class Sfi:
     def dispatch(self, command, cmd_opts, cmd_args):
         getattr(self, command)(cmd_opts, cmd_args)
  
-    def gid(self, opts, args):
-        gid = self.get_gid()
-        print "GID: %s" % (gid.save_to_string(save_parents=True))
-        return   
- 
     # list entires in named authority registry
     def list(self, opts, args):
         user_cred = self.get_user_cred().save_to_string(save_parents=True)
@@ -788,7 +767,9 @@ class Sfi:
             server = self.get_server(opts.aggregate, opts.port, self.key_file, \
                                      self.cert_file, self.options.debug)
 
-        return server.create_slice(slice_cred, slice_hrn, rspec)
+        result =  server.create_slice(slice_cred, slice_hrn, rspec)
+        print result
+        return result
 
     # get a ticket for the specified slice
     def get_ticket(self, opts, args):