From 77e3e0645cd638d80011d7ecb66a2b60ead86b2e Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Wed, 16 May 2018 23:59:49 -0700 Subject: Revert placementInfo to placement in SniroHoming Issue-ID: SO-628 Change-Id: I6e9e44d453a72b4e9ec1a0abe99eb8028aa5ba1a Signed-off-by: Marcus G K Williams --- .../groovy/org/openecomp/mso/bpmn/common/scripts/SniroHoming.groovy | 2 +- .../src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bpmn/MSOCommonBPMN') diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SniroHoming.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SniroHoming.groovy index 3f534377d8..0fdd790137 100755 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SniroHoming.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SniroHoming.groovy @@ -182,7 +182,7 @@ class SniroHoming extends AbstractServiceTaskProcessor { utils.logAudit("Sniro Async Callback Response is: " + response) sniroUtils.validateCallbackResponse(execution, response) - String placements = jsonUtil.getJsonValue(response, "solutionInfo.placementInfo") + String placements = jsonUtil.getJsonValue(response, "solutionInfo.placement") ServiceDecomposition decomposition = execution.getVariable("serviceDecomposition") utils.log("DEBUG", "Service Decomposition: " + decomposition, isDebugEnabled) diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java index 9b8a249511..de25107fcc 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java @@ -1526,7 +1526,7 @@ public class WorkflowTest { } else { try { - String homingList = getJsonValue(content, "solutionInfo.placementInfo"); + String homingList = getJsonValue(content, "solutionInfo.placement"); String licenseInfoList = getJsonValue(content, "solutionInfo.licenseInfo"); JSONArray placementArr = new JSONArray(homingList); JSONArray licenseArr = new JSONArray(licenseInfoList); @@ -1558,7 +1558,7 @@ public class WorkflowTest { } String newPlacementInfos = placementArr.toString(); String newLicenseInfos = licenseArr.toString(); - content = updJsonValue(content, "solutionInfo.placementInfo", newPlacementInfos); + content = updJsonValue(content, "solutionInfo.placement", newPlacementInfos); content = updJsonValue(content, "solutionInfo.licenseInfo", newLicenseInfos); } catch(Exception e) { -- cgit 1.2.3-korg