Fixup simulation of reloads that are optimized away.

We needed to make sure to transition into the op_mode for the "loaded" OS
and get out of RELOAD-PUSH.

tbsetup/libosload_switch.pm.in

@@ -691,16 +691,18 @@ sub Reload($$)
 	# BUT -- we need to simulate it from stated's perspective so that 
 	# the reloads table is cleared.
 	#
+	TBSetNodeNextOpMode($node_id,TBDB_NODEOPMODE_RELOADPUSH);
+	TBSetNodeEventState($node_id,TBDB_NODESTATE_SHUTDOWN);
+	# give stated time to change op modes
+	sleep(4);
 	TBSetNodeEventState($node_id,TBDB_NODESTATE_RELOADSETUP);
-	sleep(1);
 	TBSetNodeEventState($node_id,TBDB_NODESTATE_RELOADING);
-	sleep(1);
 	TBSetNodeEventState($node_id,TBDB_NODESTATE_RELOADDONE);
-	sleep(1);
+	# reset to teh op mode of the loaded image.
+	$nodeobject->Refresh();
+	$nodeobject->ResetNextOpMode($self->debug());
 	TBSetNodeEventState($node_id,TBDB_NODESTATE_SHUTDOWN);
-	sleep(1);
 	TBSetNodeEventState($node_id,TBDB_NODESTATE_BOOTING);
-	sleep(1);
 	TBSetNodeEventState($node_id,TBDB_NODESTATE_ISUP);
 
 	return 0;
@@ -729,13 +731,19 @@ sub Reload($$)
 	    # BUT -- we need to simulate it from stated's perspective so that 
 	    # the reloads table is cleared.
 	    #
+	    TBSetNodeNextOpMode($node_id,TBDB_NODEOPMODE_RELOADPUSH);
+	    TBSetNodeEventState($node_id,TBDB_NODESTATE_SHUTDOWN);
+	    # give stated time to change op modes
+	    sleep(4);
 	    TBSetNodeEventState($node_id,TBDB_NODESTATE_RELOADSETUP);
-	    sleep(1);
 	    TBSetNodeEventState($node_id,TBDB_NODESTATE_RELOADING);
-	    sleep(1);
 	    TBSetNodeEventState($node_id,TBDB_NODESTATE_RELOADDONE);
-	    sleep(1);
+	    # reset to teh op mode of the loaded image.
+	    $nodeobject->Refresh();
+	    $nodeobject->ResetNextOpMode($self->debug());
 	    TBSetNodeEventState($node_id,TBDB_NODESTATE_SHUTDOWN);
+	    TBSetNodeEventState($node_id,TBDB_NODESTATE_BOOTING);
+	    TBSetNodeEventState($node_id,TBDB_NODESTATE_ISUP);
 
 	    $rc = $self->Reconfigure($nodeobject);
 	    goto done;