Both: genocide often happens during war, and the one that has been carried out by Israel against the Palestinian population for most of the last 60 years certainly fits that model.