X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ECOMP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fpolicycontroller%2FPolicyCreation.java;h=46d02d94e9998889d064dc8999e410373bfb7828;hb=7e547eaa55920dfbc9691eab33bb728395b50cf2;hp=a987e9abfa2f5325fa416786e02a570b6cf9240c;hpb=e0addf5b588a1244f9679becd90999dfcb4c3a94;p=policy%2Fengine.git

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/PolicyCreation.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
index a987e9abf..46d02d94e 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
@@ -349,7 +349,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 							}
 						}
 					}
-					if(policyData.getRuleAlgorithmschoices().size() > 0){
+					if(policyData.getRuleAlgorithmschoices()!=null && policyData.getRuleAlgorithmschoices().size() > 0){
 						for(Object attribute : policyData.getRuleAlgorithmschoices()){
 							if(attribute instanceof LinkedHashMap<?, ?>){
 								String label = ((LinkedHashMap<?, ?>) attribute).get("id").toString();
@@ -363,7 +363,14 @@ public class PolicyCreation extends AbstractPolicyCreation{
 							}
 						}
 					}
-
+					if(policyData.getRuleProvider()!=null && policyData.getRuleProvider().equals(DecisionPolicy.GUARD_YAML) && policyData.getYamlparams()!=null){
+						attributeMap.put("actor", policyData.getYamlparams().getActor());
+						attributeMap.put("recipe", policyData.getYamlparams().getRecipe());
+						attributeMap.put("limit", policyData.getYamlparams().getLimit());
+						attributeMap.put("timeWindow", policyData.getYamlparams().getTimeWindow());
+						attributeMap.put("guardActiveStart", policyData.getYamlparams().getGuardActiveStart());
+						attributeMap.put("guardActiveEnd", policyData.getYamlparams().getGuardActiveEnd());
+					}
 					policyData.setDynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels);
 					policyData.setDynamicRuleAlgorithmCombo(dynamicRuleAlgorithmCombo);
 					policyData.setDynamicRuleAlgorithmField1(dynamicRuleAlgorithmField1);
@@ -459,7 +466,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 
 		}
 		catch (Exception e){
-			e.printStackTrace();
+			LOGGER.error("Exception Occured"+e);
 		}
 		return new ResponseEntity<String>(body, status);
 	}