From be9a2a5b46a96ef97810a3893512f7e42591c640 Mon Sep 17 00:00:00 2001 From: xuegao Date: Tue, 24 Mar 2020 16:38:01 +0100 Subject: Fix the loop deploy issue Fix deploy UI issue and update the deployment payload. Issue-ID: CLAMP-791 Change-Id: I2e652bc321e27be7c21ae12c66e98880e2eed4b5 Signed-off-by: xuegao --- src/test/java/org/onap/clamp/loop/DcaeComponentTest.java | 2 +- src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java index fc7e1c90a..b42ba987e 100644 --- a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java +++ b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java @@ -47,7 +47,7 @@ public class DcaeComponentTest { private Loop createTestLoop() { Loop loopTest = new Loop("ControlLoopTest", ""); loopTest.setGlobalPropertiesJson( - new Gson().fromJson("{\"dcaeDeployParameters\":" + "{\"policy_id\": \"name\"}}", JsonObject.class)); + new Gson().fromJson("{\"dcaeDeployParameters\":{\"loop template blueprint\": {\"policy_id\": \"name\"}}}", JsonObject.class)); loopTest.setLastComputedState(LoopState.DESIGN); loopTest.setDcaeDeploymentId("123456789"); loopTest.setDcaeDeploymentStatusUrl("http4://localhost:8085"); diff --git a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java index f1d299226..98134e828 100644 --- a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java +++ b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java @@ -71,7 +71,8 @@ public class DeployFlowTestItCase { @Test @Transactional public void deployWithSingleBlueprintTest() throws JsonSyntaxException, IOException { - Loop loopTest = createLoop("ControlLoopTest", "", "yamlcontent", "{\"testname\":\"testvalue\"}", + Loop loopTest = createLoop("ControlLoopTest", "", "yamlcontent", + "{\"dcaeDeployParameters\":{\"loop template blueprint\": {\"policy_id\": \"name\"}}}", "UUID-blueprint"); LoopTemplate template = new LoopTemplate(); template.setName("templateName"); -- cgit 1.2.3-korg