Fixed the Policy API issues and Bugfixes
[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / openecomp / policy / controller / DecisionPolicyController.java
index d21788e..2827806 100644 (file)
@@ -29,14 +29,14 @@ import java.util.Map;
 
 import javax.xml.bind.JAXBElement;
 
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
 import org.openecomp.policy.common.logging.flexlogger.Logger;
 import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
+import org.openecomp.policy.rest.adapter.YAMLParams;
 import org.openecomp.policy.rest.jpa.PolicyEntity;
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AllOfType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType;
@@ -68,9 +68,9 @@ public class DecisionPolicyController extends RestrictedBaseController {
 
        @SuppressWarnings("unchecked")
        public void prePopulateDecisionPolicyData(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
-               attributeList = new ArrayList<Object>();
-               decisionList = new ArrayList<Object>();
-               ruleAlgorithmList = new ArrayList<Object>();
+               attributeList = new ArrayList<>();
+               decisionList = new ArrayList<>();
+               ruleAlgorithmList = new ArrayList<>();
                if (policyAdapter.getPolicyData() instanceof PolicyType) {
                        Object policyData = policyAdapter.getPolicyData();
                        PolicyType policy = (PolicyType) policyData;
@@ -115,13 +115,13 @@ public class DecisionPolicyController extends RestrictedBaseController {
                                                                                AttributeDesignatorType designator = match.getAttributeDesignator();
                                                                                String attributeId = designator.getAttributeId();
                                                                                // First match in the target is EcompName, so set that value.
-                                                                               if (index == 0) {
+                                                                               if (attributeId.equals("ECOMPName")) {
                                                                                        policyAdapter.setEcompName(value);
                                                                                }
                                                                                // Component attributes are saved under Target here we are fetching  them back.
-                                                                               // One row is default so we are not adding dynamic componet at index 0.
+                                                                               // One row is default so we are not adding dynamic component at index 0.
                                                                                if (index >= 1) {       
-                                                                                       Map<String, String> attribute = new HashMap<String, String>();
+                                                                                       Map<String, String> attribute = new HashMap<>();
                                                                                        attribute.put("key", attributeId);
                                                                                        attribute.put("value", value);
                                                                                        attributeList.add(attribute);   
@@ -150,24 +150,59 @@ public class DecisionPolicyController extends RestrictedBaseController {
                                                decisionList.add(settings);
                                        } else if (object instanceof RuleType) {
                                                // get the condition data under the rule for rule Algorithms.
-                                               if (((RuleType) object).getEffect().equals(EffectType.PERMIT)) {
-                                                       ConditionType condition = ((RuleType) object).getCondition();
-                                                       if (condition != null) {
-                                                               ApplyType decisionApply = (ApplyType) condition.getExpression().getValue();
-                                                               ruleAlgoirthmTracker = new LinkedList<Integer>();
-                                                               // Populating Rule Algorithms starting from compound.
-                                                               prePopulateDecisionCompoundRuleAlgorithm(index, decisionApply);
-                                                               policyAdapter.setRuleAlgorithmschoices(ruleAlgorithmList);
-                                                       }
-                                               }else if(((RuleType) object).getEffect().equals(EffectType.DENY)) {
+                                               if(((RuleType) object).getEffect().equals(EffectType.DENY)) {
                                                        if(((RuleType) object).getAdviceExpressions()!=null){
                                                                if(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId().toString().equalsIgnoreCase("AAF")){
                                                                        policyAdapter.setRuleProvider("AAF");
                                                                        break;
+                                                               }else if(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId().toString().equalsIgnoreCase("GUARD_YAML")){
+                                                                       policyAdapter.setRuleProvider("GUARD_YAML");
+                                                               }else if(((RuleType) object).getAdviceExpressions().getAdviceExpression().get(0).getAdviceId().toString().equalsIgnoreCase("GUARD_BL_YAML")){
+                                                                       policyAdapter.setRuleProvider("GUARD_BL_YAML");
                                                                }
                                                        }else{
                                                                policyAdapter.setRuleProvider("Custom");
                                                        }
+                                                       ConditionType condition = ((RuleType) object).getCondition();
+                                                       if (condition != null) {
+                                                               ApplyType decisionApply = (ApplyType) condition.getExpression().getValue();
+                                                               decisionApply = (ApplyType) decisionApply.getExpression().get(0).getValue();
+                                                               ruleAlgoirthmTracker = new LinkedList<>();
+                                                               if(policyAdapter.getRuleProvider()!=null && (policyAdapter.getRuleProvider().equals("GUARD_YAML")||(policyAdapter.getRuleProvider().equals("GUARD_BL_YAML")))){
+                                                                       YAMLParams yamlParams = new YAMLParams();
+                                                                       for(int i=0; i<attributeList.size() ; i++){
+                                                                               Map<String, String> map = (Map<String,String>)attributeList.get(i);
+                                                                               if(map.get("key").equals("actor")){
+                                                                                       yamlParams.setActor(map.get("value"));
+                                                                               }else if(map.get("key").equals("recipe")){
+                                                                                       yamlParams.setRecipe(map.get("value"));
+                                                                               }
+                                                                       }
+                                                                       ApplyType apply = ((ApplyType)((ApplyType)decisionApply.getExpression().get(0).getValue()).getExpression().get(0).getValue());
+                                                                       yamlParams.setGuardActiveStart(((AttributeValueType)apply.getExpression().get(1).getValue()).getContent().get(0).toString());
+                                                                       yamlParams.setGuardActiveEnd(((AttributeValueType)apply.getExpression().get(2).getValue()).getContent().get(0).toString());
+                                                                       if(policyAdapter.getRuleProvider().equals("GUARD_BL_YAML")){
+                                                                               apply = (ApplyType)((ApplyType)((ApplyType)decisionApply.getExpression().get(0).getValue()).getExpression().get(1).getValue()).getExpression().get(2).getValue();
+                                                                               Iterator<JAXBElement<?>> attributes = apply.getExpression().iterator();
+                                                                               List<String> blackList = new ArrayList<>();
+                                                                               while(attributes.hasNext()){
+                                                                                       blackList.add(((AttributeValueType)attributes.next().getValue()).getContent().get(0).toString());
+                                                                               }
+                                                                               yamlParams.setBlackList(blackList);
+                                                                       }else{
+                                                                               yamlParams.setLimit(((AttributeValueType)((ApplyType)decisionApply.getExpression().get(1).getValue()).getExpression().get(1).getValue()).getContent().get(0).toString());
+                                                                               String timeWindow = ((AttributeDesignatorType)((ApplyType)((ApplyType)decisionApply.getExpression().get(1).getValue()).getExpression().get(0).getValue()).getExpression().get(0).getValue()).getIssuer();
+                                                                               yamlParams.setTimeWindow(timeWindow.substring(timeWindow.lastIndexOf(":")+1));
+                                                                       }
+                                                                       policyAdapter.setYamlparams(yamlParams);
+                                                                       policyAdapter.setAttributes(new ArrayList<Object>());
+                                                                       policyAdapter.setRuleAlgorithmschoices(new ArrayList<Object>());
+                                                                       break;
+                                                               }
+                                                               // Populating Rule Algorithms starting from compound.
+                                                               prePopulateDecisionCompoundRuleAlgorithm(index, decisionApply);
+                                                               policyAdapter.setRuleAlgorithmschoices(ruleAlgorithmList);
+                                                       }
                                                }
                                        }
                                }
@@ -178,7 +213,7 @@ public class DecisionPolicyController extends RestrictedBaseController {
        }
 
        private void prePopulateDecisionRuleAlgorithms(int index, ApplyType decisionApply, List<JAXBElement<?>> jaxbDecisionTypes) {
-               Map<String, String> ruleMap = new HashMap<String, String>();
+               Map<String, String> ruleMap = new HashMap<>();
                ruleMap.put("id", "A" + (index +1));
                Map<String, String> dropDownMap = PolicyController.getDropDownMap();
                for (String key : dropDownMap.keySet()) {
@@ -239,11 +274,12 @@ public class DecisionPolicyController extends RestrictedBaseController {
                        if (logger.isDebugEnabled()) {
                                logger.debug("Prepopulating Compound rule algorithm: " + index);
                        }
-                       Map<String, String> rule = new HashMap<String, String>();
+                       Map<String, String> rule = new HashMap<>();
                        for (String key : PolicyController.getDropDownMap().keySet()) {
                                String keyValue = PolicyController.getDropDownMap().get(key);
                                if (keyValue.equals(decisionApply.getFunctionId())) {
                                        rule.put("dynamicRuleAlgorithmCombo", key);
+                                       break;
                                }
                        }