From 1e95f8a388325499564df5f8eb6eb1fd10ca2d42 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 25 Oct 2011 16:41:08 +0200 Subject: [PATCH] renamed sfaticket from util/ to trust/ --- sfa/client/sfi.py | 2 +- sfa/managers/aggregate_manager.py | 2 +- sfa/managers/aggregate_manager_vini.py | 2 +- sfa/managers/component_manager_pl.py | 2 +- sfa/managers/slice_manager.py | 2 +- sfa/plc/api.py | 12 +++++++++++- sfa/trust/auth.py | 2 +- sfa/trust/hierarchy.py | 2 +- sfa/{util => trust}/sfaticket.py | 0 tests/testInterfaces.py | 2 +- 10 files changed, 19 insertions(+), 9 deletions(-) rename sfa/{util => trust}/sfaticket.py (100%) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 83a66f9e..0b447263 100755 --- 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.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 diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index 77af0723..84dc0dda 100644 --- 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.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 diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py index eadcbfd0..bcb27291 100644 --- 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.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 diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py index 6100e763..ec5e24c6 100644 --- 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.sfaticket import SfaTicket +from sfa.trust.sfaticket import SfaTicket 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 31753106..18cc6aa6 100644 --- 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.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 diff --git a/sfa/plc/api.py b/sfa/plc/api.py index cad22671..8a03a87c 100644 --- 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): - # 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, []) + # 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): diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py index 41c71cfd..c3dbc464 100644 --- 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.util.sfaticket import * +from sfa.trust.sfaticket import SfaTicket from sfa.util.sfalogging import logger diff --git a/sfa/trust/hierarchy.py b/sfa/trust/hierarchy.py index 63234363..dc66ef80 100644 --- 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.util.sfaticket import SfaTicket +from sfa.trust.sfaticket import SfaTicket ## # 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 d25484cf..91606371 100755 --- 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.sfaticket import * +from sfa.trust.sfaticket import SfaTicket from sfa.client import sfi def random_string(size): -- 2.43.0