X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Floop%2FLoopController.java;h=a2a44631b8fb0861717d9ef50ec7ccb983e20f9e;hb=afac3121bfacc4d81903b1d8492613b0b77d3298;hp=a02fa9333a624d1033c8f98ad09d4ae2f8bc70e5;hpb=0722ef6a099541fd82cfb69dcacc247ef24e3170;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index a02fa933..a2a44631 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -24,16 +24,17 @@
 package org.onap.clamp.loop;
 
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
-
+import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.List;
-
+import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.clamp.policy.microservice.MicroServicePolicyService;
 import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
@@ -41,14 +42,40 @@ import org.springframework.stereotype.Controller;
 public class LoopController {
 
     private final LoopService loopService;
+
+    private final ToscaConverterWithDictionarySupport toscaConverter;
+
+    private final OperationalPolicyService operationalPolicyService;
+
+    private final MicroServicePolicyService microServicePolicyService;
+
     private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {
-       }.getType();
+    }.getType();
+
     private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {
-       }.getType();
+    }.getType();
 
+
+    /**
+     * Constructor.
+     *
+     * @param loopService               loopService
+     * @param operationalPolicyService  operationalPolicyService
+     * @param microServicePolicyService microServicePolicyService
+     * @param toscaConverter            toscaConverter
+     */
     @Autowired
-    public LoopController(LoopService loopService) {
+    public LoopController(LoopService loopService, OperationalPolicyService operationalPolicyService,
+                          MicroServicePolicyService microServicePolicyService,
+                          ToscaConverterWithDictionarySupport toscaConverter) {
         this.loopService = loopService;
+        this.toscaConverter = toscaConverter;
+        this.operationalPolicyService = operationalPolicyService;
+        this.microServicePolicyService = microServicePolicyService;
+    }
+
+    public Loop createLoop(String loopName, String templateName) {
+        return loopService.createLoopFromTemplate(loopName, templateName);
     }
 
     public List<String> getLoopNames() {
@@ -61,31 +88,35 @@ public class LoopController {
 
     /**
      * Update the Operational Policy properties.
-     * @param loopName The loop name
+     *
+     * @param loopName                The loop name
      * @param operationalPoliciesJson The new Operational Policy properties
      * @return The updated loop
      */
     public Loop updateOperationalPolicies(String loopName, JsonArray operationalPoliciesJson) {
-        List<OperationalPolicy> operationalPolicies = JsonUtils.GSON
-            .fromJson(operationalPoliciesJson, OPERATIONAL_POLICY_TYPE);
+        List<OperationalPolicy> operationalPolicies = JsonUtils.GSON_JPA_MODEL.fromJson(operationalPoliciesJson,
+                OPERATIONAL_POLICY_TYPE);
         return loopService.updateAndSaveOperationalPolicies(loopName, operationalPolicies);
     }
 
     /**
-     * Update the whole array of MicroService policies properties
-     * @param loopName The loop name
-     * @param microServicePoliciesJson The array of all MicroService policies properties
+     * Update the whole array of MicroService policies properties.
+     *
+     * @param loopName                 The loop name
+     * @param microServicePoliciesJson The array of all MicroService policies
+     *                                 properties
      * @return The updated loop
      */
     public Loop updateMicroservicePolicies(String loopName, JsonArray microServicePoliciesJson) {
-        List<MicroServicePolicy> microservicePolicies = JsonUtils.GSON
-            .fromJson(microServicePoliciesJson, MICROSERVICE_POLICY_TYPE);
+        List<MicroServicePolicy> microservicePolicies = JsonUtils.GSON_JPA_MODEL.fromJson(microServicePoliciesJson,
+                MICROSERVICE_POLICY_TYPE);
         return loopService.updateAndSaveMicroservicePolicies(loopName, microservicePolicies);
     }
 
     /**
-     * Update the global properties
-     * @param loopName The loop name
+     * Update the global properties.
+     *
+     * @param loopName         The loop name
      * @param globalProperties The updated global properties
      * @return The updated loop
      */
@@ -94,8 +125,42 @@ public class LoopController {
     }
 
     /**
-     * Update one MicroService policy properties
-     * @param loopName The loop name
+     * This method add an operational policy to a loop instance.
+     *
+     * @param loopName      The loop name
+     * @param policyType    The policy model type
+     * @param policyVersion The policy model  version
+     * @return The loop modified
+     */
+    public Loop addOperationalPolicy(String loopName, String policyType, String policyVersion) throws IOException {
+        return loopService.addOperationalPolicy(loopName, policyType, policyVersion);
+    }
+
+    /**
+     * This method remove an operational policy to a loop instance.
+     *
+     * @param loopName      The loop name
+     * @param policyType    The policy model type
+     * @param policyVersion The policy model  version
+     * @return The loop modified
+     */
+    public Loop removeOperationalPolicy(String loopName, String policyType, String policyVersion) {
+        return loopService.removeOperationalPolicy(loopName, policyType, policyVersion);
+    }
+
+    /**
+     * This method deletes the loop.
+     *
+     * @param loopName The loop Name
+     */
+    public void deleteLoop(String loopName) {
+        loopService.deleteLoop(loopName);
+    }
+
+    /**
+     * Update one MicroService policy properties.
+     *
+     * @param loopName              The loop name
      * @param newMicroservicePolicy The new MicroService policy properties
      * @return The updated MicroService policy
      */
@@ -104,12 +169,47 @@ public class LoopController {
     }
 
     /**
-     * Get the SVG representation of the loop
+     * Get the SVG representation of the loop.
+     *
      * @param loopName The loop name
      * @return The SVG representation
      */
-    public String getSVGRepresentation(String loopName) {
-        return loopService.getClosedLoopModelSVG(loopName);
+    public String getSvgRepresentation(String loopName) {
+        Loop loop = loopService.getLoop(loopName);
+        return loop != null ? loop.getSvgRepresentation() : null;
+    }
+
+    /**
+     * Refresh the Operational Policy Json representation of the loop.
+     *
+     * @param loop                  The loop
+     * @param operationalPolicyName The operational policy name that needs a refresh
+     * @return The loop object
+     */
+    public Loop refreshOperationalPolicyJsonRepresentation(Loop loop, String operationalPolicyName) {
+        for (OperationalPolicy operationalPolicy : loop.getOperationalPolicies()) {
+            if (operationalPolicy.getName().equals(operationalPolicyName)) {
+                this.operationalPolicyService
+                        .refreshOperationalPolicyJsonRepresentation(operationalPolicy, toscaConverter);
+            }
+        }
+        return loop;
+    }
 
+    /**
+     * Refresh the Config Policy Json representation of the loop.
+     *
+     * @param loop                   The loop
+     * @param microServicePolicyName The microservice policy name that needs a refresh
+     * @return The loop object
+     */
+    public Loop refreshMicroServicePolicyJsonRepresentation(Loop loop, String microServicePolicyName) {
+        for (MicroServicePolicy microServicePolicy : loop.getMicroServicePolicies()) {
+            if (microServicePolicy.getName().equals(microServicePolicyName)) {
+                this.microServicePolicyService
+                        .refreshMicroServicePolicyJsonRepresentation(microServicePolicy, toscaConverter, loop);
+            }
+        }
+        return loop;
     }
 }