From everything I have read, North Korea wants food aid. It is facing (another) dire food crisis and this is a way for it to get aid (as a concession for behaving). I don't think North Korea has any interest or much to gain from going to war. Nor does the U.S. for that matter. So things will calm back down once North Korea gets what it wants, food.