diff options
| author |   George, Lina (lg941u) <lg941u@att.com> | 2018-09-18 16:48:29 -0400 |
|---|---|---|
| committer |   Takamune Cho <tc012c@att.com> | 2018-09-19 20:17:53 +0000 |
| commit | 0b7cd61bb7db6ab4e71a35b85647f6fa8bb6e099 (patch) | |
| tree | 7b4cda6aaf0fedee1212f1c6824ea7180a0372fd /appc-config/appc-flow-controller/provider/src/main | |
| parent | ba28cb6a1255a7372c00b2dee85be1f15e86c8fd (diff) | |
Changes to identity-url for multistep flow
Change-Id: I82f1d4302ebd4ad53d7f1f0b78b16f98ee8916f9
Issue-ID: APPC-1186
Signed-off-by: George, Lina (lg941u) <lg941u@att.com>
Diffstat (limited to 'appc-config/appc-flow-controller/provider/src/main')
2 files changed, 3 insertions, 5 deletions
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/dbervices/FlowControlDBService.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/dbervices/FlowControlDBService.java index 733d03bf6..10c456426 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/dbervices/FlowControlDBService.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/dbervices/FlowControlDBService.java @@ -75,9 +75,6 @@ public class FlowControlDBService { String fn = "DBService.getflowModelInfo"; String whereClause = " where ACTION = $" + FlowControllerConstants.REQUEST_ACTION; - if (StringUtils.isNotBlank(ctx.getAttribute(FlowControllerConstants.VNF_TYPE))) { - whereClause = whereClause.concat(" and VNF_TYPE = $" + FlowControllerConstants.VNF_TYPE); - } if (StringUtils.isNotBlank(ctx.getAttribute(FlowControllerConstants.ACTION_LEVEL))) { whereClause = whereClause.concat(" and ACTION_LEVEL = $" + FlowControllerConstants.ACTION_LEVEL); } diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/InventoryInfoExtractor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/InventoryInfoExtractor.java index 631b72cc0..4e2706514 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/InventoryInfoExtractor.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/InventoryInfoExtractor.java @@ -81,9 +81,10 @@ class InventoryInfoExtractor { for (String key : ctx.getAttributeKeySet()) { log.debug("InventoryData " + key + "=" + ctx.getAttribute(key)); } - String urlFromPayload= ctx.getAttribute("AICIdentity"); + String urlFromPayload= ctx.getAttribute("identity-url"); log.info("Url from payload:" + urlFromPayload); - String urlFromAAI=ctx.getAttribute("tmp.vnfInfo.identity-url"); + String urlFromAAI=ctx.getAttribute("tmp.vnfInfo.cloud-region.identity-url"); + log.info("Url from AAI:" + urlFromAAI); if(StringUtils.isNotBlank(urlFromPayload)){ identityUrl=urlFromPayload; |