fix

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 0392e98..599abfb 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -92,8 +92,7 @@ class TestPlc:
         'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
         'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP,
         'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP,
-       'sfa_install', 'sfa_tables_install', 'sfa_plc_install', 'sfa_client_install', SEPSFA,
-        'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
+        'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
         'sfi_configure@1', 'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA,
         'sfa_create_slice@1', 'sfa_check_slice_plc@1', SEPSFA, 
         'sfa_update_user@1', 'sfa_update_slice@1', 'sfa_view@1', 'sfa_utest@1',SEPSFA,
@@ -114,7 +113,8 @@ class TestPlc:
         'populate' , SEP,
         'nodestate_show','nodestate_safeboot','nodestate_boot', SEP,
         'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
-        'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEP,
+       'sfa_install', 'sfa_tables_install', 'sfa_plc_install', 'sfa_client_install', SEPSFA,
+        'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
         'plc_db_dump' , 'plc_db_restore', SEP,
         'standby_1_through_20',SEP,
         ]
@@ -587,7 +587,7 @@ class TestPlc:
                      'PLC_MAIL_ENABLED',
                      'PLC_MAIL_SUPPORT_ADDRESS',
                      'PLC_DB_HOST',
-                     'PLC_DB_PASSWORD',
+#                     'PLC_DB_PASSWORD',
                     # Above line was added for integrating SFA Testing
                      'PLC_API_HOST',
                      'PLC_WWW_HOST',
@@ -1126,6 +1126,10 @@ class TestPlc:
     # in particular runs with --preserve (dont cleanup) and without --check
     # also it gets run twice, once with the --foreign option for creating fake foreign entries
 
+    def sfa_install_all (self):
+        "yum install sfa sfa-plc sfa-sfatables sfa-client"
+        return self.yum_install ("sfa sfa-plc sfa-sfatables sfa-client")
+
     ### sfa_install_rpm
     def sfa_install(self):
         "yum install sfa"
@@ -1143,7 +1147,7 @@ class TestPlc:
         
     ### sfa_install_rpm
     def sfa_tables_install(self):
-        "yum install sfa-client"
+        "yum install sfa-sfatables"
         return self.yum_install ("sfa-sfatables")
 
     def sfa_dbclean(self):
@@ -1238,9 +1242,9 @@ class TestPlc:
                      'SFA_PLC_PASSWORD',
                      'SFA_DB_HOST',
                      'SFA_DB_USER',
-                     'SFA_DB_PASSWORD',
+#                     'SFA_DB_PASSWORD',
                      # should be tmp
-                     'SFA_DB_NAME',
+#                     'SFA_DB_NAME',
                      ]:
             fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
         # the way plc_config handles booleans just sucks..