fix

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index acb5d07..a00a9e5 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -90,14 +90,14 @@ class TestPlc:
         'delete_vs','create_vs','install', 'configure', 'start', SEP,
         'fetch_keys', 'store_keys', 'clear_known_hosts', SEP,
         'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
-        'reinstall_node', 'init_node','bootcd', 'configure_qemu', 'export_qemu',
-        'kill_all_qemus', 'start_node', SEP,
+        'reinstall_node', 'init_node','bootcd', 'configure_qemu', 'export_qemu', 'kill_all_qemus', 'start_node', SEP,
+       'install_sfa', 'configure_sfa', 'cross_configure_sfa', 'import_sfa', 'start_sfa', SEPSFA,
+        'configure_sfi@1', 'add_user_sfa@1', 'add_sfa@1', 'create_sfa@1', SEPSFA, 
+        'update_sfa_user@1', 'update_sfa@1', 'view_sfa@1', SEPSFA,
         # better use of time: do this now that the nodes are taking off
         'plcsh_stress_test', SEP,
-       'install_sfa', 'configure_sfa', 'cross_configure_sfa', 'import_sfa', 'start_sfa', SEPSFA,
-        'configure_sfi@1', 'add_sfa@1', 'create_sfa@1', 'update_sfa@1', 'view_sfa@1', SEPSFA,
         'nodes_ssh_debug', 'nodes_ssh_boot', 'check_slice', 'check_initscripts', SEPSFA,
-        'check_slice_sfa@1', 'delete_sfa_user@1', 'delete_sfa_slices@1', SEPSFA,
+        'check_slice_sfa@1', 'delete_sfa_user@1', 'delete_slice_sfa@1', SEPSFA,
         'check_tcp',  'check_hooks',  SEP,
         'force_gather_logs', 'force_resources_post', SEP,
         ]
@@ -1070,7 +1070,8 @@ class TestPlc:
 
     def dbclean_sfa(self):
         "thoroughly wipes off the SFA database"
-        return self.run_in_guest("sfa-nuke-plc.py")==0
+        self.run_in_guest("sfa-nuke-plc.py")==0
+        return True
 
     def plcclean_sfa(self):
         "cleans the PLC entries that were created as a side effect of running the script"
@@ -1094,6 +1095,8 @@ class TestPlc:
         self.run_in_guest("rm -rf /var/lib/sfa")
         self.run_in_guest("rm -rf /etc/sfa")
         self.run_in_guest("rm -rf /var/log/sfa_access.log /var/log/sfa_import_plc.log /var/log/sfa.daemon")
+        # xxx tmp 
+        self.run_in_guest("rpm -e --noscripts sfa-plc")
         return True
 
     ###
@@ -1140,6 +1143,11 @@ class TestPlc:
                     'SFA_PLC_URL',
                      ]:
             fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
+        # the way plc_config handles booleans just sucks..
+        for var in ['SFA_API_DEBUG']:
+            val='false'
+            if self.plc_spec['sfa'][var]: val='true'
+            fileconf.write ('e %s\n%s\n'%(var,val))
         fileconf.write('w\n')
         fileconf.write('R\n')
         fileconf.write('q\n')
@@ -1251,6 +1259,9 @@ class TestPlc:
         self.run_in_guest("rm -rf /root/.sfi")
         return True
 
+    def add_user_sfa(self):
+        return TestUserSfa(self).add_user()
+
     @slice_sfa_mapper
     def add_sfa(self):
         "run sfi.py add (on Registry)"
@@ -1261,6 +1272,9 @@ class TestPlc:
         "run sfi.py create (on SM) for 1st-time creation"
         pass
 
+    def update_sfa_user(self):
+        return TestUserSfa(self).update_user()
+
     @slice_sfa_mapper
     def update_sfa(self):
         "run sfi.py create (on SM) on existing object"
@@ -1293,7 +1307,8 @@ class TestPlc:
 
     def stop_sfa(self):
         "service sfa stop"
-        return self.run_in_guest('service sfa stop')==0
+        self.run_in_guest('service sfa stop')==0
+        return True
 
     def populate (self):
         "creates random entries in the PLCAPI"