Fix soft stop and start of engine

Stopping an apexc engine is a soft stop, allowing the engine
to be restarted again. However, when a model upgrade is carried out
the engine must be stopped and cleared to clear the previous model,
loaded with the new model and started again.

THis handling must work over the Web Socket admin interface and
also when apex is started as a service.

This change fixes the handling so that it is consistent and
works the same when apex is stopped/started/upgraded from
the command line or over the management web socket interface

Issue-ID: POLICY-1101
Change-Id: I1fe619641cb6ecd34d0669b4b7df105280e5e2c0
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

1 files changed, 0 insertions, 5 deletions

diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/EventAlbumContextTest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/EventAlbumContextTest.java
index d68576d16..aa7b56189 100644
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/EventAlbumContextTest.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/EventAlbumContextTest.java
@@ -86,12 +86,8 @@ public class EventAlbumContextTest {
         final String[] cliArgs = new String[] { "-c", tempCommandFile.getCanonicalPath(), "-l",
                         tempLogFile.getAbsolutePath(), "-o", tempModelFile.getAbsolutePath() };
 
-        ModelService.clear();
-
         new ApexCLIEditorMain(cliArgs);
 
-        ModelService.clear();
-
         final String[] args = new String[] { "-m", tempModelFile.getAbsolutePath(), "-c", configFile };
         final ApexMain apexMain = new ApexMain(args);
 
@@ -111,7 +107,6 @@ public class EventAlbumContextTest {
 
         // Shut down Apex
         apexMain.shutdown();
-        ParameterService.clear();
 
         assertTrue("Test failed, the output event file was not created", outputEventFile.exists());
         outputEventFile.delete();