sfa_import only relies on sfaadmin

sfa_standalone does invoke sfa-import to create the toplevel auth record

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 6c9007d..dcc7dd3 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1376,9 +1376,8 @@ class TestPlc:
     def sfa_import(self):
         "sfa-import-plc"
         auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
-        return self.run_in_guest('sfa-import.py')==0 or \
-               self.run_in_guest('sfa-import-plc.py')==0 or \
-               self.run_in_guest('sfaadmin.py registry import_registry')==0
+        return \
+            self.run_in_guest('sfaadmin.py reg import_registry')==0 
 # not needed anymore
 #        self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth))
 

diff --git a/system/macros.py b/system/macros.py
index 6d4ceaa..b4a4815 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -77,6 +77,7 @@ sequences['sfa_standalone'] = [
     'sfa_configure',
     'cross_sfa_configure',
     'sfa_start',
+    'sfa_import',
     'sfi_configure',
     'sfa_add_site',
     'sfa_add_pi',