rename cert.py into certificate.py

diff --git a/geni/__init__.py b/geni/__init__.py
index 5247403..ce91335 100644 (file)
--- a/geni/__init__.py
+++ b/geni/__init__.py
@@ -7,6 +7,4 @@ nuke
 plc
 registry
 slicemgr
-test
-testsm
 """.split()

diff --git a/geni/alt_aggregate.py b/geni/alt_aggregate.py
index 2a866f3..3dee031 100644 (file)
--- a/geni/alt_aggregate.py
+++ b/geni/alt_aggregate.py
@@ -9,7 +9,7 @@ import xmlrpclib
 
 from geni.util.geniserver import GeniServer
 from geni.util.geniclient import *
-from geni.util.cert import Keypair, Certificate
+from geni.util.certificate import Keypair, Certificate
 from geni.util.credential import Credential
 from geni.util.trustedroot import TrustedRootList
 from geni.util.faults import *

diff --git a/geni/gimport.py b/geni/gimport.py
index 12de56a..1823426 100755 (executable)
--- a/geni/gimport.py
+++ b/geni/gimport.py
@@ -21,7 +21,7 @@ import getopt
 import sys
 import tempfile
 
-from geni.util.cert import *
+from geni.util.certificate import *
 from geni.util.trustedroot import *
 from geni.util.hierarchy import *
 from geni.util.record import *

diff --git a/geni/methods/__init__.py b/geni/methods/__init__.py
index 9fe8148..5f97897 100644 (file)
--- a/geni/methods/__init__.py
+++ b/geni/methods/__init__.py
@@ -3,7 +3,6 @@ all = """
 create_gid
 create_slice
 delete_slice
-get_aggregates
 get_credential
 get_resources
 get_slices

diff --git a/geni/methods/create_gid.py b/geni/methods/create_gid.py
index 08663c5..66552ee 100644 (file)
--- a/geni/methods/create_gid.py
+++ b/geni/methods/create_gid.py
@@ -5,7 +5,7 @@ from geni.util.faults 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.util.certificate import Keypair 
 
 class create_gid(Method):
     """

diff --git a/geni/methods/get_ticket.py b/geni/methods/get_ticket.py
index 667b20a..5257323 100644 (file)
--- a/geni/methods/get_ticket.py
+++ b/geni/methods/get_ticket.py
@@ -5,7 +5,7 @@ from geni.util.faults 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.util.certificate import Keypair 
 from geni.util.geniticket import *
 
 class get_ticket(Method):

diff --git a/geni/methods/register.py b/geni/methods/register.py
index 12c4939..7d3c8ad 100644 (file)
--- a/geni/methods/register.py
+++ b/geni/methods/register.py
@@ -6,7 +6,7 @@ from geni.util.method import Method
 from geni.util.parameter import Parameter, Mixed
 from geni.util.auth import Auth
 from geni.util.record import GeniRecord
-from geni.util.cert import Keypair, convert_public_key
+from geni.util.certificate import Keypair, convert_public_key
 from geni.util.gid import *
 from geni.util.debug import log
 from geni.util.misc import *

diff --git a/geni/plc.py b/geni/plc.py
index 5f00b97..0fc1eb5 100644 (file)
--- a/geni/plc.py
+++ b/geni/plc.py
@@ -39,7 +39,7 @@ from optparse import OptionParser
 
 from geni.util.hierarchy import Hierarchy
 from geni.util.trustedroot import TrustedRootList
-from geni.util.cert import Keypair, Certificate
+from geni.util.certificate import Keypair, Certificate
 from geni.util.config import Config
 from geni.registry import Registry
 from geni.aggregate import Aggregate

diff --git a/geni/util/__init__.py b/geni/util/__init__.py
index 627b2ee..16fdf92 100644 (file)
--- a/geni/util/__init__.py
+++ b/geni/util/__init__.py
@@ -6,7 +6,6 @@ cert
 config
 credential
 debug
-excep
 faults
 geniclient
 geniserver
@@ -27,7 +26,6 @@ rspec
 slices
 specdict
 storage
-testrspec
 trustedroot
 util
 """.split()

diff --git a/geni/util/cert.py b/geni/util/certificate.py
similarity index 100%
rename from geni/util/cert.py
rename to geni/util/certificate.py

diff --git a/geni/util/credential.py b/geni/util/credential.py
index 0fb8240..26239da 100644 (file)
--- a/geni/util/credential.py
+++ b/geni/util/credential.py
@@ -10,7 +10,7 @@
 
 import xmlrpclib
 
-from geni.util.cert import *
+from geni.util.certificate import *
 from geni.util.rights import *
 from geni.util.gid import *
 

diff --git a/geni/util/geniserver.py b/geni/util/geniserver.py
index 9e01774..2c49cf7 100644 (file)
--- a/geni/util/geniserver.py
+++ b/geni/util/geniserver.py
@@ -21,7 +21,7 @@ import SimpleXMLRPCServer
 
 from OpenSSL import SSL
 
-from geni.util.cert import *
+from geni.util.certificate import *
 from geni.util.credential import *
 from geni.util.faults import *
 from geni.util.api import GeniAPI 

diff --git a/geni/util/geniticket.py b/geni/util/geniticket.py
index 1ca0ab2..28c8d45 100644 (file)
--- a/geni/util/geniticket.py
+++ b/geni/util/geniticket.py
@@ -6,11 +6,12 @@
 ### $Id$
 ### $URL$
 
-from cert import *
-from rights import *
-from gid import *
 import xmlrpclib
 
+from geni.util.certificate import *
+from geni.util.rights import *
+from geni.util.gid import *
+
 # Ticket is tuple:
 #   (gidCaller, gidObject, attributes, rspec, delegate)
 #

diff --git a/geni/util/gid.py b/geni/util/gid.py
index cd7ba01..0815e84 100644 (file)
--- a/geni/util/gid.py
+++ b/geni/util/gid.py
@@ -6,10 +6,11 @@
 ### $Id$
 ### $URL$
 
-from cert import *
-import uuid
 import xmlrpclib
 
+from geni.util.certificate import *
+import geni.util.uuid
+
 ##
 # Create a new uuid. Returns the UUID as a string.
 

diff --git a/geni/util/hierarchy.py b/geni/util/hierarchy.py
index dd2bd50..395c67c 100644 (file)
--- a/geni/util/hierarchy.py
+++ b/geni/util/hierarchy.py
@@ -18,7 +18,7 @@
 import os
 import report
 
-from geni.util.cert import *
+from geni.util.certificate import *
 from geni.util.credential import *
 from geni.util.gid import *
 from geni.util.misc import *