1 files changed, 13 insertions, 11 deletions
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VcpeControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VcpeControlLoopTest.java
index 7d5a4f3a8..57085f614 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VcpeControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VcpeControlLoopTest.java
@@ -30,10 +30,10 @@ import java.util.HashMap;
 import java.util.UUID;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.policy.appclcm.LcmRequest;
-import org.onap.policy.appclcm.LcmRequestWrapper;
-import org.onap.policy.appclcm.LcmResponse;
-import org.onap.policy.appclcm.LcmResponseWrapper;
+import org.onap.policy.appclcm.AppcLcmBody;
+import org.onap.policy.appclcm.AppcLcmDmaapWrapper;
+import org.onap.policy.appclcm.AppcLcmInput;
+import org.onap.policy.appclcm.AppcLcmOutput;
 import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.common.endpoints.event.comm.TopicListener;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
@@ -155,7 +155,7 @@ public class VcpeControlLoopTest extends ControlLoopBase implements TopicListene
                     org.onap.policy.controlloop.VirtualControlLoopNotification.class);
         } else if ("APPC-LCM-READ".equals(topic)) {
             obj = org.onap.policy.appclcm.util.Serialization.gsonJunit.fromJson(event,
-                    org.onap.policy.appclcm.LcmRequestWrapper.class);
+                    org.onap.policy.appclcm.AppcLcmDmaapWrapper.class);
         }
         assertNotNull(obj);
         if (obj instanceof VirtualControlLoopNotification) {
@@ -205,12 +205,12 @@ public class VcpeControlLoopTest extends ControlLoopBase implements TopicListene
                 logger.debug("The control loop timed out");
                 fail("Control Loop Timed Out");
             }
-        } else if (obj instanceof LcmRequestWrapper) {
+        } else if (obj instanceof AppcLcmDmaapWrapper) {
             /*
              * The request should be of type LcmRequestWrapper and the subrequestid should be 1
              */
-            LcmRequestWrapper dmaapRequest = (LcmRequestWrapper) obj;
-            LcmRequest appcRequest = dmaapRequest.getBody();
+            AppcLcmDmaapWrapper dmaapRequest = (AppcLcmDmaapWrapper) obj;
+            AppcLcmInput appcRequest = dmaapRequest.getBody().getInput();
             assertTrue(appcRequest.getCommonHeader().getSubRequestId().equals("1"));
             assertNotNull(appcRequest.getActionIdentifiers().get("vnf-id"));
 
@@ -219,11 +219,13 @@ public class VcpeControlLoopTest extends ControlLoopBase implements TopicListene
             /*
              * Simulate a success response from APPC and insert the response into the working memory
              */
-            LcmResponseWrapper dmaapResponse = new LcmResponseWrapper();
-            LcmResponse appcResponse = new LcmResponse(appcRequest);
+            AppcLcmDmaapWrapper dmaapResponse = new AppcLcmDmaapWrapper();
+            AppcLcmOutput appcResponse = new AppcLcmOutput(appcRequest);
             appcResponse.getStatus().setCode(400);
             appcResponse.getStatus().setMessage("AppC success");
-            dmaapResponse.setBody(appcResponse);
+            dmaapResponse.setBody(new AppcLcmBody());
+            dmaapResponse.getBody().setOutput(appcResponse);
+
             kieSession.insert(dmaapResponse);
         }
     }