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

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index a600033..ca61463 100755 (executable)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -15,7 +15,7 @@ from sfa.trust.credential import Credential
 from sfa.util.geniclient import GeniClient
 from sfa.util.sfaticket import SfaTicket
 from sfa.util.record import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import RSpec
 from sfa.util.xmlrpcprotocol import ServerException
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol

diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py
index e4ff71a..7f0a253 100644 (file)
--- a/sfa/managers/aggregate_manager_max.py
+++ b/sfa/managers/aggregate_manager_max.py
@@ -3,7 +3,7 @@
 from sfa.util.rspec import RSpec
 import sys
 import pdb
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *

diff --git a/sfa/managers/aggregate_manager_openflow.py b/sfa/managers/aggregate_manager_openflow.py
index df1cf78..e784f6f 100755 (executable)
--- a/sfa/managers/aggregate_manager_openflow.py
+++ b/sfa/managers/aggregate_manager_openflow.py
@@ -1,5 +1,5 @@
 from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import RSpec
 from sfa.server.registry import Registries
 from sfa.util.config import Config

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index 858f48a..949d71e 100644 (file)
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -7,7 +7,7 @@ import traceback
 import sys
 
 from types import StringTypes
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *

diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py
index cba6957..a596668 100644 (file)
--- a/sfa/managers/aggregate_manager_vini.py
+++ b/sfa/managers/aggregate_manager_vini.py
@@ -1,5 +1,5 @@
 from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import RSpec
 from sfa.server.registry import Registries
 from sfa.plc.nodes import *

diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py
index dd48df8..3a6df6c 100644 (file)
--- a/sfa/managers/component_manager_pl.py
+++ b/sfa/managers/component_manager_pl.py
@@ -1,7 +1,7 @@
 import os
 import xmlrpclib
 from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.sfaticket import SfaTicket
 
 def init_server():

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index 72f39e5..c5b0f26 100644 (file)
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -7,7 +7,7 @@ import traceback
 import sys
 
 from types import StringTypes
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *

diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index 0801527..f35ec42 100644 (file)
--- a/sfa/plc/api.py
+++ b/sfa/plc/api.py
@@ -17,7 +17,7 @@ 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.namespace import *
 from sfa.util.api import *
 from sfa.util.nodemanager import NodeManager
 from sfa.util.sfalogging import *

diff --git a/sfa/plc/nodes.py b/sfa/plc/nodes.py
index dbab98e..9a2a853 100644 (file)
--- a/sfa/plc/nodes.py
+++ b/sfa/plc/nodes.py
@@ -7,7 +7,7 @@ import datetime
 import sys
 import traceback
 
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import *
 from sfa.util.specdict import * 
 from sfa.util.faults import *

diff --git a/sfa/plc/peers.py b/sfa/plc/peers.py
index a1cc6a2..455c682 100644 (file)
--- a/sfa/plc/peers.py
+++ b/sfa/plc/peers.py
@@ -1,4 +1,4 @@
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from types import StringTypes
 
 def get_peer(api, hrn):

diff --git a/sfa/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py
index 11a259f..16335a1 100755 (executable)
--- a/sfa/plc/sfa-import-plc.py
+++ b/sfa/plc/sfa-import-plc.py
@@ -24,7 +24,7 @@ import logging.handlers
 import logging
 from sfa.util.record import *
 from sfa.util.genitable import GeniTable
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.config import Config
 from sfa.trust.certificate import convert_public_key, Keypair
 from sfa.trust.trustedroot import *

diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py
index 8859c00..399c23a 100644 (file)
--- a/sfa/plc/sfaImport.py
+++ b/sfa/plc/sfaImport.py
@@ -14,10 +14,9 @@ import tempfile
 
 from sfa.util.record import *
 from sfa.util.genitable import GeniTable
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.config import Config
 from sfa.util.report import trace, error
-
 from sfa.trust.certificate import convert_public_key, Keypair
 from sfa.trust.trustedroot import *
 from sfa.trust.hierarchy import *

diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py
index 622c0e9..4fa3098 100644 (file)
--- a/sfa/plc/slices.py
+++ b/sfa/plc/slices.py
@@ -7,7 +7,7 @@ import traceback
 import sys
 
 from types import StringTypes
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *

diff --git a/sfa/rspecs/aggregates/rspec_manager_max.py b/sfa/rspecs/aggregates/rspec_manager_max.py
index e4ff71a..7f0a253 100644 (file)
--- a/sfa/rspecs/aggregates/rspec_manager_max.py
+++ b/sfa/rspecs/aggregates/rspec_manager_max.py
@@ -3,7 +3,7 @@
 from sfa.util.rspec import RSpec
 import sys
 import pdb
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *

diff --git a/sfa/rspecs/aggregates/rspec_manager_openflow.py b/sfa/rspecs/aggregates/rspec_manager_openflow.py
index df1cf78..e784f6f 100755 (executable)
--- a/sfa/rspecs/aggregates/rspec_manager_openflow.py
+++ b/sfa/rspecs/aggregates/rspec_manager_openflow.py
@@ -1,5 +1,5 @@
 from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import RSpec
 from sfa.server.registry import Registries
 from sfa.util.config import Config

diff --git a/sfa/rspecs/aggregates/rspec_manager_vini.py b/sfa/rspecs/aggregates/rspec_manager_vini.py
index cba6957..a596668 100644 (file)
--- a/sfa/rspecs/aggregates/rspec_manager_vini.py
+++ b/sfa/rspecs/aggregates/rspec_manager_vini.py
@@ -1,5 +1,5 @@
 from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.rspec import RSpec
 from sfa.server.registry import Registries
 from sfa.plc.nodes import *

diff --git a/sfa/server/sfa-clean-peer-records.py b/sfa/server/sfa-clean-peer-records.py
index 235ddaf..1a858ce 100644 (file)
--- a/sfa/server/sfa-clean-peer-records.py
+++ b/sfa/server/sfa-clean-peer-records.py
@@ -3,7 +3,7 @@
 import sys
 import os
 import traceback
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.genitable import GeniTable
 from sfa.util.geniclient import GeniClient
 from sfa.plc.api import GeniAPI

diff --git a/sfa/server/sfa_component_setup.py b/sfa/server/sfa_component_setup.py
index 78bc125..728c433 100755 (executable)
--- a/sfa/server/sfa_component_setup.py
+++ b/sfa/server/sfa_component_setup.py
@@ -5,7 +5,7 @@ import tempfile
 from optparse import OptionParser
 from sfa.util.config import Config
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.misc as misc
+from sfa.util.namepace import *
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
 from sfa.trust.gid import GID
@@ -185,7 +185,7 @@ def get_gids(registry=None, verbose=False):
     from sfa.plc.api import ComponentAPI
     api = ComponentAPI()
     slicenames = api.nodemanager.GetXIDs().keys()   
-    hrns = [misc.slicename_to_hrn(interface_hrn, slicename) for slicename in slicenames]
+    hrns = [slicename_to_hrn(interface_hrn, slicename) for slicename in slicenames]
         
 
     if verbose:
@@ -197,7 +197,7 @@ def get_gids(registry=None, verbose=False):
         # if this isnt a slice record skip it
         if not record['type'] == 'slice':
             continue
-        slicename = misc.hrn_to_pl_slicename(record['hrn'])
+        slicename = hrn_to_pl_slicename(record['hrn'])
         # if this slice isnt really instatiated skip it
         if not os.path.exists("/vservers/%(slicename)s" % locals()):
             continue

diff --git a/sfa/server/slicemgr.py b/sfa/server/slicemgr.py
index d0782b5..800bcc7 100644 (file)
--- a/sfa/server/slicemgr.py
+++ b/sfa/server/slicemgr.py
@@ -8,8 +8,6 @@ import time
 
 from sfa.util.geniserver import *
 from sfa.util.geniclient import *
-from sfa.util.faults import *
-from sfa.util.misc import *
 
 class SliceMgr(GeniServer):
 

diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py
index a68f2e7..43a81f3 100644 (file)
--- a/sfa/trust/auth.py
+++ b/sfa/trust/auth.py
@@ -13,7 +13,7 @@ from sfa.trust.rights import RightList
 from sfa.util.faults import *
 from sfa.trust.hierarchy import Hierarchy
 from sfa.util.config import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.trust.gid import GID
 from sfa.util.sfaticket import *
 

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index fbf2eca..0954cd8 100644 (file)
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -24,7 +24,6 @@ from sfa.util.faults import *
 # to perform this encoding.
 
 class Credential(Certificate):
-    gidOriginCaller = None
     gidCaller = None
     gidObject = None
     lifeTime = None
@@ -42,20 +41,6 @@ class Credential(Certificate):
     def __init__(self, create=False, subject=None, string=None, filename=None):
         Certificate.__init__(self, create, subject, string, filename)
 
-    ## set the GID of the original caller
-    #
-    # @param gid GID object of the original caller
-    def set_gid_origin_caller(self, gid):
-        self.gidOriginCaller = gid  
-
-    ##
-    # get the GID of the object
-
-    def get_gid_origin_caller(self):
-        if not self.gidOriginCaller:
-            self.decode()
-        return self.gidOriginCaller
-
     ##
     # set the GID of the caller
     #
@@ -159,14 +144,11 @@ class Credential(Certificate):
     # done immediately before signing the credential.
 
     def encode(self):
-        dict = {"gidOriginCaller": None,
-                "gidCaller": None,
+        dict = {"gidCaller": None,
                 "gidObject": None,
                 "lifeTime": self.lifeTime,
                 "privileges": None,
                 "delegate": self.delegate}
-        if self.gidOriginCaller:
-            dict["gidOriginCaller"] = self.gidOriginCaller.save_to_string(save_parents=True)
         if self.gidCaller:
             dict["gidCaller"] = self.gidCaller.save_to_string(save_parents=True)
         if self.gidObject:
@@ -197,12 +179,6 @@ class Credential(Certificate):
         else:
             self.privileges = None
 
-        gidOriginCallerStr = dict.get("gidOriginCaller", None)
-        if gidOriginCallerStr:
-            self.gidOriginCaller = GID(string=gidOriginCallerStr)
-        else:
-            self.gidOriginCaller = None
-
         gidCallerStr = dict.get("gidCaller", None)
         if gidCallerStr:
             self.gidCaller = GID(string=gidCallerStr)
@@ -251,11 +227,6 @@ class Credential(Certificate):
 
         print "      privs:", self.get_privileges().save_to_string()
 
-        print "  gidOriginCaller:"
-        gidOriginCaller = self.get_gid_origin_caller()
-        if gidOriginCaller:
-            gidOriginCaller.dump(8, dump_parents)
-
         print "  gidCaller:"
         gidCaller = self.get_gid_caller()
         if gidCaller:

diff --git a/sfa/trust/hierarchy.py b/sfa/trust/hierarchy.py
index 66010b7..990a394 100644 (file)
--- a/sfa/trust/hierarchy.py
+++ b/sfa/trust/hierarchy.py
@@ -21,8 +21,7 @@ from sfa.util.report import *
 from sfa.trust.certificate import Keypair
 from sfa.trust.credential import *
 from sfa.trust.gid import GID, create_uuid
-
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.config import Config
 from sfa.util.sfaticket import SfaTicket
 

diff --git a/sfa/util/api.py b/sfa/util/api.py
index bcbea6f..db98a26 100644 (file)
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -17,7 +17,7 @@ from sfa.util.faults import *
 from sfa.util.debug import *
 from sfa.trust.credential import *
 from sfa.trust.certificate import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.sfalogging import *
 
 # See "2.2 Characters" in the XML specification:

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 02ad5d3..a61ce3d 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -70,7 +70,9 @@ class Config:
 
             # create the data directory if it doesnt exist
             if not os.path.isdir(self.SFA_DATA_DIR):
-                os.mkdir(self.SFA_DATA_DIR)
+                try:
+                    os.mkdir(self.SFA_DATA_DIR)
+                except: pass
              
         except IOError, e:
             raise IOError, "Could not find the configuration file: %s" % config_file

diff --git a/sfa/util/record.py b/sfa/util/record.py
index 512381c..de221fc 100644 (file)
--- a/sfa/util/record.py
+++ b/sfa/util/record.py
@@ -14,7 +14,7 @@ from sfa.trust.gid import *
 import sfa.util.report
 from sfa.util.rspec import *
 from sfa.util.parameter import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.row import Row
 
 class GeniRecord(Row):