def create_top_level_auth_records(hrn):
parent_hrn = get_authority(hrn)
- print hrn, ":", parent_hrn
+ print hrn, ":", parent_hrn
+ if not parent_hrn:
+ parent_hrn = hrn
auth_info = AuthHierarchy.get_auth_info(parent_hrn)
table = get_auth_table(parent_hrn)
if not AuthHierarchy.auth_exists(root_auth):
AuthHierarchy.create_auth(root_auth)
- #create_top_level_auth_records(root_auth)
-
+ create_top_level_auth_records(root_auth)
if level1_auth:
if not AuthHierarchy.auth_exists(level1_auth):
AuthHierarchy.create_auth(level1_auth)
self.verify_object_permission(record.get_name())
auth_name = get_authority(record.get_name())
+ if not auth_name:
+ auth_name = record.get_name()
table = self.get_auth_table(auth_name)
# make sure the record exists
def resolve_raw(self, type, name, must_exist=True):
auth_name = get_authority(name)
-
+ if not auth_name:
+ auth_name = name
table = self.get_auth_table(auth_name)
-
records = table.resolve(type, name)
-
if (not records) and must_exist:
raise RecordNotFound(name)
self.verify_object_belongs_to_me(name)
auth_hrn = get_authority(name)
+ if not auth_hrn:
+ auth_hrn = name
auth_info = self.get_auth_info(auth_hrn)
-
# find a record that matches
records = self.resolve_raw(type, name, must_exist=True)
record = records[0]
def verify_cancreate_credential(self, src_cred, record):
type = record.get_type()
cred_object_hrn = src_cred.get_gid_object().get_hrn()
+ config = Config()
+ if cred_object_hrn in [config.GENI_REGISTRY_ROOT_AUTH]:
+ return
if type=="slice":
researchers = record.get_geni_info().get("researcher", [])
if not (cred_object_hrn in researchers):
self.verify_object_belongs_to_me(name)
auth_hrn = get_authority(name)
+ if not auth_hrn:
+ auth_hrn = name
auth_info = self.get_auth_info(auth_hrn)
records = self.resolve_raw(type, name, must_exist=True)
# that they should be combined?
auth_hrn = get_authority(name)
+ if not auth_hrn:
+ auth_hrn = name
auth_info = self.get_auth_info(auth_hrn)
records = self.resolve_raw("slice", name, must_exist=True)