diff options
author | Balaji, Ramya (rb111y) <rb111y@att.com> | 2018-05-23 15:07:57 -0400 |
---|---|---|
committer | Patrick Brady <pb071s@att.com> | 2018-05-23 20:02:24 +0000 |
commit | d5662e4f5ad44fe89b455d0596e185f7e4c905f0 (patch) | |
tree | 4827bf97b3a578ba1c1874028e6442ee1eb26f46 /appc-config/appc-flow-controller/provider/src/main/java | |
parent | 07fcbfcd2e65135556fce021748aa6c338cf710d (diff) |
Healthcheck bug fixes
Fixed code to set userid and
password correctly. Also set the url
in context when passed in reference
artifact.
Cherry-pick from master branch
Issue-ID: APPC-917
Change-Id: Iba5a873cc311ab5677b6223c08865c048dbdcf00
Signed-off-by: Balaji, Ramya (rb111y) <rb111y@att.com>
(cherry picked from commit 17e3dbc0a2af683609c5d8cebdcc68884a29b1aa)
Diffstat (limited to 'appc-config/appc-flow-controller/provider/src/main/java')
-rw-r--r-- | appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java index b4becd9b1..71ab8f7aa 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java @@ -21,6 +21,8 @@ package org.onap.appc.flow.controller.node; import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION; import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION_TYPE; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.VNF_TYPE; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_PROTOCOL; import java.util.Properties; import org.apache.commons.lang3.StringUtils; @@ -37,7 +39,11 @@ class TransactionHandler { String inputRequestAction = ctx.getAttribute(INPUT_REQUEST_ACTION); String inputRequestActionType = ctx.getAttribute(INPUT_REQUEST_ACTION_TYPE); + String vnfType = ctx.getAttribute(VNF_TYPE); + if (StringUtils.isBlank(vnfType)) { + throw new Exception("Don't know vnf type to send REST request for " + INPUT_REQUEST_ACTION + " - " +vnfType); + } if (StringUtils.isBlank(inputRequestActionType)) { throw new Exception("Don't know REST operation for Action " + inputRequestActionType); } @@ -50,11 +56,14 @@ class TransactionHandler { transaction.setExecutionRPC(inputRequestActionType); transaction.setAction(INPUT_REQUEST_ACTION); - //This code need to get changed to get the UserID and pass from a common place. - transaction.setuId(prop.getProperty(inputRequestAction.concat(".default-rest-user"))); - transaction.setPswd(prop.getProperty(inputRequestAction.concat(".default-rest-pass"))); - + String userKey = vnfType + "." + REST_PROTOCOL + "." + inputRequestAction + ".user"; + String passwordKey = vnfType + "." + REST_PROTOCOL + "." + inputRequestAction + ".password"; + transaction.setuId(prop.getProperty(userKey)); + transaction.setPswd(prop.getProperty(passwordKey)); + if (StringUtils.isBlank(transaction.getuId()) || StringUtils.isBlank(transaction.getPswd())) { + throw new Exception ("User Id or Password is not set !!!"); + } return transaction; } -}
\ No newline at end of file +} |