X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=cd36c0cd40dc45ee4697bb4f1fb3722e2dc66d70;hb=ad834ec7b976049bbd88beb85559dda440eda57c;hp=3005b2088cd56d52d1c71e6d042eeecbbac758f3;hpb=af6722f87d9f36e7385421f9ce21e8861167d5ca;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index 3005b20..cd36c0c 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -162,13 +162,15 @@ class TestPlc: 'check_vsys_defaults_ignore', SEP, # run this first off so it's easier to re-run on another qemu box 'qemu_kill_mine', 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP, - 'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 'qemu_nodefamily', SEP, + 'qemu_clean_mine', 'qemu_export', 'qemu_cleanlog', SEP, + 'qemu_start', 'qemu_timestamp', 'qemu_nodefamily', SEP, 'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA, 'sfi_configure@1', 'sfa_register_site@1','sfa_register_pi@1', SEPSFA, 'sfa_register_user@1', 'sfa_update_user@1', 'sfa_register_slice@1', 'sfa_renew_slice@1', SEPSFA, 'sfa_remove_user_from_slice@1','sfi_show_slice_researchers@1', 'sfa_insert_user_in_slice@1','sfi_show_slice_researchers@1', SEPSFA, - 'sfa_discover@1', 'sfa_rspec@1', 'sfa_allocate@1', 'sfa_provision@1', SEPSFA, + 'sfa_discover@1', 'sfa_rspec@1', SEPSFA, + 'sfa_allocate@1', 'sfa_provision@1', 'sfa_describe@1', SEPSFA, 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA, 'sfi_list@1', 'sfi_show_site@1', 'sfa_utest@1', SEPSFA, # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot @@ -183,6 +185,7 @@ class TestPlc: # for inspecting the slice while it runs the first time #'fail', # check slices are turned off properly + 'debug_nodemanager', 'empty_slices', 'ssh_slice_off', 'slice_fs_deleted_ignore', SEP, # check they are properly re-created with the same name 'fill_slices', 'ssh_slice_again', SEP, @@ -196,14 +199,15 @@ class TestPlc: 'delete_leases', 'list_leases', SEP, 'populate', SEP, 'nodestate_show','nodestate_safeboot','nodestate_boot', 'nodestate_upgrade', SEP, - 'nodefcdistro_show','nodefcdistro_f14','nodefcdistro_f18', 'nodefcdistro_f20', 'nodefcdistro_f21', SEP, + 'nodedistro_show','nodedistro_f14','nodedistro_f18', SEP, + 'nodedistro_f20', 'nodedistro_f21','nodedistro_f22', SEP, 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP, 'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA, 'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA, 'sfa_get_expires', SEPSFA, 'plc_db_dump' , 'plc_db_restore', SEP, 'check_netflow','check_drl', SEP, - 'debug_nodemanager', 'slice_fs_present', SEP, + 'slice_fs_present', SEP, 'standby_1_through_20','yes','no',SEP, 'install_syslinux6', 'bonding_builds', 'bonding_nodes', SEP, ] @@ -339,7 +343,9 @@ class TestPlc: def yum_install(self, rpms): if isinstance(rpms, list): rpms=" ".join(rpms) - self.run_in_guest("yum -y install {}".format(rpms)) + yum_mode = self.run_in_guest("yum -y install {}".format(rpms)) + if yum_mode != 0: + self.run_in_guest("dnf -y install --allowerasing {}".format(rpms)) # yum-complete-transaction comes with yum-utils, that is in vtest.pkgs self.run_in_guest("yum-complete-transaction -y") return self.yum_check_installed(rpms) @@ -709,7 +715,6 @@ class TestPlc: def plc_install(self): """ yum install myplc, noderepo - plain bootstrapfs is not installed anymore """ # compute nodefamily @@ -725,7 +730,6 @@ class TestPlc: pkgs_list.append("slicerepo-{}".format(nodefamily)) pkgs_list.append("myplc") pkgs_list.append("noderepo-{}".format(nodefamily)) - pkgs_list.append("nodeimage-{}-plain".format(nodefamily)) pkgs_string=" ".join(pkgs_list) return self.yum_install(pkgs_list) @@ -772,7 +776,7 @@ class TestPlc: "run plc-config-tty" tmpname = '{}.plc-config-tty'.format(self.name()) with open(tmpname,'w') as fileconf: - for (var,value) in self.plc_spec['settings'].items(): + for var, value in self.plc_spec['settings'].items(): fileconf.write('e {}\n{}\n'.format(var, value)) fileconf.write('w\n') fileconf.write('q\n') @@ -1126,7 +1130,7 @@ class TestPlc: return True # probing nodes - def check_nodes_ping(self, timeout_seconds=30, period_seconds=10): + def check_nodes_ping(self, timeout_seconds=60, period_seconds=10): class CompleterTaskPingNode(CompleterTask): def __init__(self, hostname): self.hostname = hostname @@ -1193,6 +1197,8 @@ class TestPlc: @node_mapper def qemu_export(self): pass @node_mapper + def qemu_cleanlog(self): pass + @node_mapper def nodestate_reinstall(self): pass @node_mapper def nodestate_upgrade(self): pass @@ -1203,15 +1209,17 @@ class TestPlc: @node_mapper def nodestate_show(self): pass @node_mapper - def nodefcdistro_f14(self): pass + def nodedistro_f14(self): pass + @node_mapper + def nodedistro_f18(self): pass @node_mapper - def nodefcdistro_f18(self): pass + def nodedistro_f20(self): pass @node_mapper - def nodefcdistro_f20(self): pass + def nodedistro_f21(self): pass @node_mapper - def nodefcdistro_f21(self): pass + def nodedistro_f22(self): pass @node_mapper - def nodefcdistro_show(self): pass + def nodedistro_show(self): pass ### check hooks : invoke scripts from hooks/{node,slice} def check_hooks_node(self): @@ -1648,7 +1656,7 @@ class TestPlc: "run sfa-config-tty" tmpname = self.conffile("sfa-config-tty") with open(tmpname,'w') as fileconf: - for (var,value) in self.plc_spec['sfa']['settings'].items(): + for var, value in self.plc_spec['sfa']['settings'].items(): fileconf.write('e {}\n{}\n'.format(var, value)) fileconf.write('w\n') fileconf.write('R\n') @@ -1764,6 +1772,8 @@ class TestPlc: @auth_sfa_mapper def sfa_provision_empty(self): pass @auth_sfa_mapper + def sfa_describe(self): pass + @auth_sfa_mapper def sfa_check_slice_plc(self): pass @auth_sfa_mapper def sfa_check_slice_plc_empty(self): pass