# just create certs for all sfa interfaces even if they
# arent enabled
interface_hrn = self.config.SFA_INTERFACE_HRN
- interfaces = ['sa', 'am', 'sm']
+ interfaces = ['authority+sa', 'authority+am', 'authority+sm']
table = SfaTable()
auth_info = self.AuthHierarchy.get_auth_info(interface_hrn)
pkey = auth_info.get_pkey_object()
parts = Xrn.urn_split(self.urn)
type=parts.pop(2)
# Remove the authority name (e.g. '.sa')
- if type == 'authority': parts.pop()
+ if type == 'authority':
+ name = parts.pop()
+ # Drop the sa. This is a bad hack, but its either this
+ # or completely change how record types are generated/stored
+ if name != 'sa':
+ type = type + "+" + name
# convert parts (list) into hrn (str) by doing the following
# 1. remove blank parts
if self.hrn.startswith(Xrn.URN_PREFIX):
raise SfaAPIError, "Xrn.hrn_to_urn, hrn=%s"%self.hrn
- if self.type == 'authority':
+ if self.type.startswith('authority'):
self.authority = Xrn.hrn_split(self.hrn)
- name = 'sa'
+ type_parts = self.type.split("+")
+ self.type = type_parts[0]
+ name = 'sa'
+ if len(type_parts) > 1:
+ name = type_parts[1]
else:
self.authority = Xrn.hrn_auth_list(self.hrn)
name = Xrn.hrn_leaf(self.hrn)