From 7e8938e2bf7eae76bd527a28fd453650cf744e1a Mon Sep 17 00:00:00 2001 From: xg353y Date: Fri, 3 May 2019 13:23:40 +0200 Subject: Fix the bugs in loop state logic Fix the bugs in the logic to get the loop state Issue-ID: CLAMP-362 Change-Id: I9d931f1a1ceed3d9e173b3ee742f8e349b7e653f Signed-off-by: xg353y --- .../java/org/onap/clamp/loop/LoopOperation.java | 40 +++++++++++++++++----- .../resources/clds/camel/rest/clamp-api-v2.xml | 25 ++++---------- .../resources/clds/camel/routes/flexible-flow.xml | 14 ++++---- 3 files changed, 44 insertions(+), 35 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/onap/clamp/loop/LoopOperation.java b/src/main/java/org/onap/clamp/loop/LoopOperation.java index f38b59145..c3eb08be7 100644 --- a/src/main/java/org/onap/clamp/loop/LoopOperation.java +++ b/src/main/java/org/onap/clamp/loop/LoopOperation.java @@ -34,7 +34,9 @@ import com.google.gson.JsonPrimitive; import java.io.IOException; import java.lang.reflect.Array; import java.util.Collection; +import java.util.Iterator; import java.util.Map; +import java.util.Set; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -42,6 +44,7 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import org.onap.clamp.clds.config.ClampProperties; +import org.onap.clamp.policy.operational.OperationalPolicy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.yaml.snakeyaml.Yaml; @@ -143,10 +146,10 @@ public class LoopOperation { String statusUrl = (String) linksObj.get(DCAE_STATUS_FIELD); // use http4 instead of http, because camel http4 component is used to do the http call - statusUrl.replace("http", "http4"); + String newStatusUrl = statusUrl.replaceAll("http:", "http4:"); loop.setDcaeDeploymentId(deploymentId); - loop.setDcaeDeploymentStatusUrl(statusUrl); + loop.setDcaeDeploymentStatusUrl(newStatusUrl); loopService.saveOrUpdateLoop(loop); } @@ -157,7 +160,7 @@ public class LoopOperation { * @return The state based on policy response * @throws ParseException The parse exception */ - public String analysePolicyResponse(int statusCode) throws ParseException { + public String analysePolicyResponse(int statusCode) { if (statusCode == 200) { return TempLoopState.SUBMITTED.toString(); } else if (statusCode == 404) { @@ -166,6 +169,22 @@ public class LoopOperation { return TempLoopState.IN_ERROR.toString(); } + /** + * Get the name of the first Operational policy. + * + * @param loop The closed loop + * @return The name of the first operational policy + */ + public String getOperationalPolicyName(Loop loop) { + Set opSet = (Set)loop.getOperationalPolicies(); + Iterator iterator = opSet.iterator(); + while (iterator.hasNext()) { + OperationalPolicy policy = iterator.next(); + return policy.getName(); + } + return null; + } + /** * Get the Closed Loop status based on the reply from DCAE. * @@ -189,13 +208,13 @@ public class LoopOperation { String status = (String) jsonObj.get("status"); // status = processing/successded/failed - if (status == "successed") { - if (opType == "install") { + if (status.equals("succeeded")) { + if (opType.equals("install")) { return TempLoopState.DEPLOYED.toString(); - } else if (status == "successed") { + } else if (opType.equals("uninstall")) { return TempLoopState.NOT_DEPLOYED.toString(); } - } else if (status == "processing") { + } else if (status.equals("processing")) { return TempLoopState.PROCESSING.toString(); } } else if (statusCode == 404) { @@ -205,13 +224,14 @@ public class LoopOperation { } /** - * Get the status of the closed loop based on the response from Policy and DCAE. + * Update the status of the closed loop based on the response from Policy and DCAE. * + * @param loop The closed loop * @param policyState The state get from Policy * @param dcaeState The state get from DCAE * @throws ParseException The parse exception */ - public LoopState updateLoopStatus(TempLoopState policyState, TempLoopState dcaeState) { + public LoopState updateLoopStatus(Loop loop, TempLoopState policyState, TempLoopState dcaeState) { LoopState clState = LoopState.IN_ERROR; if (policyState == TempLoopState.SUBMITTED) { if (dcaeState == TempLoopState.DEPLOYED) { @@ -226,6 +246,8 @@ public class LoopOperation { clState = LoopState.DESIGN; } } + loop.setLastComputedState(clState); + loopService.saveOrUpdateLoop(loop); return clState; } diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml index 2640d6bd6..45cad032e 100644 --- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml +++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml @@ -207,24 +207,14 @@ uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" /> - - ${exchangeProperty[loopObject].getOperationalPolicies()} - - - ${body} - - - - + - - + message="policy status0000: ${exchangeProperty[policyStatus]}"> + ${exchangeProperty[policyStatus]} == 'SUBMITTED' and ${exchangeProperty[dcaeStatus]} == 'NOT_DEPLOYED' @@ -609,11 +599,10 @@ - + uri="bean:org.onap.clamp.loop.LoopOperation?method=updateLoopStatus(${exchangeProperty[loopObject]},${exchangeProperty[policyStatus]}, ${exchangeProperty[dcaeStatus]})" /> + message="Get Status request successfully executed. The new state is: ${body}" /> - - null - + + + GET @@ -625,9 +626,9 @@ + message="Endpoint to query from Policy DPD: {{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicyName]}/versions/deployed"> + uri="{{clamp.config.policy.pap.url}}/policy/api/v1/policytypes/onap.policies.controlloop.operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicyName]}/versions/deployed?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&httpClient.connectTimeout=10000&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}" /> - -- cgit 1.2.3-korg