fix reboot test

involves restructuring of the testsetup code to avoid 
addfloatingip code duplication