added type to class

[sfa.git] / sfa / plc / sfaImport.py

diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py
index 3f19741..238b5e1 100644 (file)
--- a/sfa/plc/sfaImport.py
+++ b/sfa/plc/sfaImport.py
@@ -104,7 +104,7 @@ class sfaImport:
         # 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()
@@ -187,15 +187,7 @@ class sfaImport:
             slice_record['record_id'] = existing_record['record_id']
             table.update(slice_record)
 
-    def import_node(self, parent_hrn, node):
-        nodename = node['hostname'].split(".")[0]
-        nodename = _cleanup_string(nodename)
-        
-        if not nodename:
-            self.logger.error("Import: failed to parse node %s" %node['hostname'])
-            return
-
-        hrn = parent_hrn + "." + nodename
+    def import_node(self, hrn, node):
         self.logger.info("Import: node %s" % hrn)
         # ASN.1 will have problems with hrn's longer than 64 characters
         if len(hrn) > 64: