Changes needed for MultiStep Actions

[appc.git] / appc-config / appc-flow-controller / provider / src / main / java / org / onap / appc / flow / controller / node / TransactionHandler.java

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 71ab8f7..3a0a6a6 100644 (file)
--- 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
@@ -3,6 +3,7 @@
  * ONAP : APPC
  * ================================================================================
  * Copyright (C) 2018 Nokia. All rights reserved.
+ * Copyright (C) 2018 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.
@@ -21,10 +22,9 @@ 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 static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_USER;
+import static org.onap.appc.flow.controller.utils.FlowControllerConstants.REST_PWD;
 
-import java.util.Properties;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.appc.flow.controller.data.Transaction;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -34,16 +34,12 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
  */
 class TransactionHandler {
 
-  Transaction buildTransaction(SvcLogicContext ctx, Properties prop, String resourceUri)
+  Transaction buildTransaction(SvcLogicContext ctx, String resourceUri)
       throws Exception {
 
     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);
     }
@@ -56,13 +52,10 @@ class TransactionHandler {
     transaction.setExecutionRPC(inputRequestActionType);
     transaction.setAction(INPUT_REQUEST_ACTION);
 
-    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 !!!");
-    }
+
+    transaction.setuId(ctx.getAttribute(REST_USER));
+    transaction.setPswd(ctx.getAttribute(REST_PWD));
+
     return transaction;
   }