X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=geni%2Fmethods%2Fcreate_gid.py;h=0a8b54b43ce7cd48360255a0c8eeea136d333833;hb=fbe847fbea237fc77f95fffb3766bc85b953841a;hp=7e8b6fda5b56a32cae2a6c6d63d46d7a2d69a5a5;hpb=70f233e2aed245423d6fcb23697fabc992cec94f;p=sfa.git

diff --git a/geni/methods/create_gid.py b/geni/methods/create_gid.py
index 7e8b6fda..0a8b54b4 100644
--- a/geni/methods/create_gid.py
+++ b/geni/methods/create_gid.py
@@ -1,9 +1,11 @@
+### $Id$
+### $URL$
+
 from geni.util.faults import *
-from geni.util.excep import *
 from geni.util.method import Method
 from geni.util.parameter import Parameter, Mixed
 from geni.util.auth import Auth
-from geni.util.cert import Keypair 
+from geni.trust.certificate import Keypair 
 
 class create_gid(Method):
     """
@@ -32,7 +34,7 @@ class create_gid(Method):
     returns = Parameter(str, "String represeneation of a GID object")
     
     def call(self, cred, hrn, uuid, pubkey_str):
-        self.api.auth.decode_authentication(cred, "getcredential")
+        self.api.auth.check(cred, "getcredential")
         self.api.auth.verify_object_belongs_to_me(hrn)
         self.api.auth.verify_object_permission(hrn)
 
@@ -41,6 +43,6 @@ class create_gid(Method):
 
         pkey = Keypair()
         pkey.load_pubkey_from_string(pubkey_str)
-        gid = self.api.auth.hierarchy.create_gid(name, uuid, pkey)
+        gid = self.api.auth.hierarchy.create_gid(hrn, uuid, pkey)
 
         return gid.save_to_string(save_parents=True)