diff options
4 files changed, 21 insertions, 27 deletions
diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java index d496455eb..e45ee0aea 100644 --- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java +++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java @@ -21,9 +21,10 @@ package org.onap.policy.so; +import static org.junit.Assert.assertNotNull; + import java.util.HashMap; import java.util.Map; - import org.junit.Test; import org.onap.policy.so.util.Serialization; import org.slf4j.Logger; @@ -103,6 +104,7 @@ public class DemoTest { logger.debug(Serialization.gsonPretty.toJson(request)); + assertNotNull(request); } @Test @@ -166,6 +168,8 @@ public class DemoTest { request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement2); logger.debug(Serialization.gsonPretty.toJson(request)); + + assertNotNull(request); } } diff --git a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java index 1c530c797..f66e9ecd6 100644 --- a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java +++ b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2017-2019 Intel Corp. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2018-2019 AT&T Corporation. All rights reserved. + * Modifications Copyright (C) 2018-2020 AT&T Corporation. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ package org.onap.policy.vfc; +import static org.junit.Assert.assertNotNull; + import java.util.LinkedList; import org.junit.Test; import org.onap.policy.vfc.util.Serialization; @@ -80,5 +82,6 @@ public class DemoTest { body = Serialization.gsonPretty.toJson(response); logger.info("{}", body); + assertNotNull(body); } } diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java index 0492c4e55..b6e8b04bc 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java @@ -4,7 +4,7 @@ * ================================================================================ * Copyright (C) 2018 Huawei. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,14 +46,7 @@ public class SdncSimulatorJaxRs { @Consumes(MediaType.APPLICATION_JSON) @Produces("application/json") public String sdncPostQuery() { - final SdncResponse response = new SdncResponse(); - response.setRequestId(UUID.randomUUID().toString()); - SdncResponseOutput responseOutput = new SdncResponseOutput(); - responseOutput.setResponseCode("200"); - responseOutput.setAckFinalIndicator("Y"); - responseOutput.setSvcRequestId(UUID.randomUUID().toString()); - response.setResponseOutput(responseOutput); - return Serialization.gsonPretty.toJson(response); + return makeSuccessResponse(); } @@ -67,6 +60,11 @@ public class SdncSimulatorJaxRs { @Consumes(MediaType.APPLICATION_JSON) @Produces("application/json") public String sdncVnfTopologyOperation() { + return makeSuccessResponse(); + } + + + private String makeSuccessResponse() { final SdncResponse response = new SdncResponse(); response.setRequestId(UUID.randomUUID().toString()); SdncResponseOutput responseOutput = new SdncResponseOutput(); diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java index b06a66f41..ed6bce9e0 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java @@ -53,22 +53,7 @@ public class SoSimulatorJaxRs { @Produces("application/json") public String soPostQuery(@PathParam("serviceInstanceId") final String serviceInstanceId, @PathParam("vnfInstanceId") final String vnfInstanceId) { - final SoRequest request = new SoRequest(); - final SoRequestStatus requestStatus = new SoRequestStatus(); - requestStatus.setRequestState("COMPLETE"); - request.setRequestStatus(requestStatus); - request.setRequestId(UUID.randomUUID()); - - final SoResponse response = new SoResponse(); - - final SoRequestReferences requestReferences = new SoRequestReferences(); - final String requestId = UUID.randomUUID().toString(); - requestReferences.setRequestId(requestId); - response.setRequestReferences(requestReferences); - - response.setRequest(request); - - return new Gson().toJson(response); + return makeCompleteSuccess(); } /** @@ -85,6 +70,10 @@ public class SoSimulatorJaxRs { public String soDelete(@PathParam("serviceInstanceId") final String serviceInstanceId, @PathParam("vnfInstanceId") final String vnfInstanceId, @PathParam("vfModuleInstanceId") final String vfModuleInstanceId) { + return makeCompleteSuccess(); + } + + private String makeCompleteSuccess() { final SoRequest request = new SoRequest(); final SoRequestStatus requestStatus = new SoRequestStatus(); requestStatus.setRequestState("COMPLETE"); |