X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fhierarchy.py;h=cf330db28b9700550989018212c53c1ec1156ca9;hb=aae6c396c5161b2ba3debe2af8609f344dbb2c6e;hp=598ba561378b7e1bfc716bc989212293c90ec596;hpb=2cf6d0e7089437ec8ad8e5fdfac26760e0c7a331;p=sfa.git diff --git a/sfa/trust/hierarchy.py b/sfa/trust/hierarchy.py index 598ba561..cf330db2 100644 --- a/sfa/trust/hierarchy.py +++ b/sfa/trust/hierarchy.py @@ -141,7 +141,7 @@ class Hierarchy: # @param create_parents if true, also create the parents if they do not exist def create_auth(self, xrn, create_parents=False): - hrn, type = urn_to_hrn(xrn) + hrn, type = urn_to_hrn(str(xrn)) logger.debug("Hierarchy: creating authority: %s"% hrn) # create the parent authority if necessary @@ -174,18 +174,9 @@ class Hierarchy: """ Create top level records (includes root and sub authorities (local/remote) """ - if not hrn: - hrn = self.config.SFA_INTERFACE_HRN - # make sure parent exists - parent_hrn = get_authority(hrn) - if not parent_hrn: - parent_hrn = hrn - if not parent_hrn == hrn: - self.create_top_level_auth(parent_hrn) - # create the authority if it doesnt alrady exist if not self.auth_exists(hrn): - self.create_auth(hrn) + self.create_auth(hrn, create_parents=True) def get_interface_auth_info(self, create=True):