renamed sfaticket from util/ to trust/

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 83a66f9..0b44726 100755 (executable)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -18,7 +18,7 @@ from sfa.util.sfalogging import sfi_logger
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.gid import GID
 from sfa.trust.credential import Credential
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.gid import GID
 from sfa.trust.credential import Credential

-from sfa.util.sfaticket import SfaTicket
+from sfa.trust.sfaticket import SfaTicket

 from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
 from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.rspec_converter import RSpecConverter
 from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
 from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.rspec_converter import RSpecConverter

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 77af072..84dc0dd 100644 (file)
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -12,7 +12,7 @@ from sfa.util.specdict import *
 from sfa.util.record import SfaRecord
 from sfa.util.policy import Policy
 from sfa.util.record import *
 from sfa.util.record import SfaRecord
 from sfa.util.policy import Policy
 from sfa.util.record import *

-from sfa.util.sfaticket import SfaTicket
+from sfa.trust.sfaticket import SfaTicket

 from sfa.plc.slices import Slices
 from sfa.trust.credential import Credential
 import sfa.plc.peers as peers
 from sfa.plc.slices import Slices
 from sfa.trust.credential import Credential
 import sfa.plc.peers as peers

diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py
index eadcbfd..bcb2729 100644 (file)
--- a/sfa/managers/aggregate_manager_vini.py
+++ b/sfa/managers/aggregate_manager_vini.py
@@ -11,7 +11,7 @@ from sfa.util.faults import *
 from sfa.util.record import SfaRecord
 from sfa.util.policy import Policy
 from sfa.util.record import *
 from sfa.util.record import SfaRecord
 from sfa.util.policy import Policy
 from sfa.util.record import *

-from sfa.util.sfaticket import SfaTicket
+from sfa.trust.sfaticket import SfaTicket

 from sfa.server.registry import Registries
 from sfa.plc.slices import Slices
 import sfa.plc.peers as peers
 from sfa.server.registry import Registries
 from sfa.plc.slices import Slices
 import sfa.plc.peers as peers

diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py
index 6100e76..ec5e24c 100644 (file)
--- a/sfa/managers/component_manager_pl.py
+++ b/sfa/managers/component_manager_pl.py
@@ -3,7 +3,7 @@ import xmlrpclib
 
 from sfa.util.faults import *
 from sfa.util.plxrn import PlXrn
 
 from sfa.util.faults import *
 from sfa.util.plxrn import PlXrn

-from sfa.util.sfaticket import SfaTicket
+from sfa.trust.sfaticket import SfaTicket

 from sfa.util.version import version_core
 
 def GetVersion(api):
 from sfa.util.version import version_core
 
 def GetVersion(api):

diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py
index 3175310..18cc6aa 100644 (file)
--- a/sfa/managers/slice_manager.py
+++ b/sfa/managers/slice_manager.py
@@ -20,7 +20,7 @@ from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec 
 from sfa.util.policy import Policy
 from sfa.util.prefixTree import prefixTree
 from sfa.rspecs.rspec import RSpec 
 from sfa.util.policy import Policy
 from sfa.util.prefixTree import prefixTree

-from sfa.util.sfaticket import *
+from sfa.trust.sfaticket import SfaTicket

 from sfa.trust.credential import Credential
 from sfa.util.threadmanager import ThreadManager
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol     
 from sfa.trust.credential import Credential
 from sfa.util.threadmanager import ThreadManager
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol     

diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index cad2267..8a03a87 100644 (file)
--- a/sfa/plc/api.py
+++ b/sfa/plc/api.py
@@ -576,12 +576,22 @@ class SfaAPI(BaseAPI):
         self.fill_record_sfa_info(records)
 
     def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc):
         self.fill_record_sfa_info(records)
 
     def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc):

-        # get a list of the HRNs tht are members of the old and new records
+        # get a list of the HRNs that are members of the old and new records

         if oldRecord:
             oldList = oldRecord.get(listName, [])
         else:
             oldList = []     
         newList = record.get(listName, [])
         if oldRecord:
             oldList = oldRecord.get(listName, [])
         else:
             oldList = []     
         newList = record.get(listName, [])

+        # ugly hack to see what's next
+        def normalize (value):
+            from types import StringTypes
+            from sfa.util.sfalogging import logger
+            if isinstance(value,StringTypes): return value
+            elif isinstance(value,dict): 
+                newvalue=value['text']
+                logger.info("Normalizing %s=>%s"%(value,newvalue))
+                return newvalue
+        newList=[normalize(v) for v in newList]

 
         # if the lists are the same, then we don't have to update anything
         if (oldList == newList):
 
         # if the lists are the same, then we don't have to update anything
         if (oldList == newList):

diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py
index 41c71cf..c3dbc46 100644 (file)
--- a/sfa/trust/auth.py
+++ b/sfa/trust/auth.py
@@ -10,7 +10,7 @@ from sfa.util.faults import *
 from sfa.trust.hierarchy import Hierarchy
 from sfa.util.config import *
 from sfa.util.xrn import get_authority
 from sfa.trust.hierarchy import Hierarchy
 from sfa.util.config import *
 from sfa.util.xrn import get_authority

-from sfa.util.sfaticket import *
+from sfa.trust.sfaticket import SfaTicket

 
 from sfa.util.sfalogging import logger
 
 
 from sfa.util.sfalogging import logger
 

diff --git a/sfa/trust/hierarchy.py b/sfa/trust/hierarchy.py
index 6323436..dc66ef8 100644 (file)
--- a/sfa/trust/hierarchy.py
+++ b/sfa/trust/hierarchy.py
@@ -21,7 +21,7 @@ from sfa.trust.certificate import Keypair
 from sfa.trust.credential import Credential
 from sfa.trust.gid import GID, create_uuid
 from sfa.util.config import Config
 from sfa.trust.credential import Credential
 from sfa.trust.gid import GID, create_uuid
 from sfa.util.config import Config

-from sfa.util.sfaticket import SfaTicket
+from sfa.trust.sfaticket import SfaTicket

 
 ##
 # The AuthInfo class contains the information for an authority. This information
 
 ##
 # The AuthInfo class contains the information for an authority. This information

diff --git a/sfa/util/sfaticket.py b/sfa/trust/sfaticket.py
similarity index 100%
rename from sfa/util/sfaticket.py
rename to sfa/trust/sfaticket.py

diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py
index d25484c..9160637 100755 (executable)
--- a/tests/testInterfaces.py
+++ b/tests/testInterfaces.py
@@ -12,7 +12,7 @@ from sfa.util.xrn import get_authority
 from sfa.util.config import *
 from sfa.trust.certificate import *
 from sfa.trust.credential import *
 from sfa.util.config import *
 from sfa.trust.certificate import *
 from sfa.trust.credential import *

-from sfa.util.sfaticket import *
+from sfa.trust.sfaticket import SfaTicket

 from sfa.client import sfi
 
 def random_string(size):
 from sfa.client import sfi
 
 def random_string(size):