X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fpolicycontroller%2FPolicyCreation.java;h=a6cda5e680f66c04fb5fcdf6a77c5fab63255631;hb=95524c8ef8be0d41de8bb2b918f320e464ebb897;hp=48f67aa94559b6beeeb6b462c78af56384f79de8;hpb=9bf8e18042746f52b96155bb2654dfb472f09e14;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
index 48f67aa94..a6cda5e68 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/policycontroller/PolicyCreation.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -44,6 +44,7 @@ import org.onap.policy.pap.xacml.rest.components.CreateClosedLoopPerformanceMetr
 import org.onap.policy.pap.xacml.rest.components.DecisionPolicy;
 import org.onap.policy.pap.xacml.rest.components.FirewallConfigPolicy;
 import org.onap.policy.pap.xacml.rest.components.MicroServiceConfigPolicy;
+import org.onap.policy.pap.xacml.rest.components.OptimizationConfigPolicy;
 import org.onap.policy.pap.xacml.rest.components.Policy;
 import org.onap.policy.pap.xacml.rest.components.PolicyDBDao;
 import org.onap.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
@@ -133,6 +134,8 @@ public class PolicyCreation extends AbstractPolicyCreation{
 					filePrefix = "Config_PM_";
 				}else if ("Micro Service".equalsIgnoreCase(policyConfigType)) {
 					filePrefix = "Config_MS_";
+				}else if ("Optimization".equalsIgnoreCase(policyConfigType)) {
+					filePrefix = "Config_OOF_";
 				}else if ("BRMS_Raw".equalsIgnoreCase(policyConfigType)) {
 					filePrefix = "Config_BRMS_Raw_";
 				}else if ("BRMS_Param".equalsIgnoreCase(policyConfigType)) {
@@ -247,14 +250,14 @@ public class PolicyCreation extends AbstractPolicyCreation{
 			policyData.setHighestVersion(version);
 
 			// Calling Component class per policy type
-			if (policyType.equalsIgnoreCase("Config")) {
-				if (policyConfigType.equalsIgnoreCase("Firewall Config")) {
+			if ("Config".equalsIgnoreCase(policyType)) {
+				if ("Firewall Config".equalsIgnoreCase(policyConfigType)) {
 					newPolicy = new FirewallConfigPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("BRMS_Raw")) { 
+				}else if ("BRMS_Raw".equalsIgnoreCase(policyConfigType)) { 
 					policyData.setOnapName("DROOLS");
 					policyData.setConfigName("BRMS_RAW_RULE");
 					newPolicy = new CreateBrmsRawPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("BRMS_Param")) {
+				}else if ("BRMS_Param".equalsIgnoreCase(policyConfigType)) {
 					policyData.setOnapName("DROOLS");
 					policyData.setConfigName("BRMS_PARAM_RULE");
 					Map<String, String> drlRuleAndUIParams = new HashMap<>();
@@ -287,11 +290,11 @@ public class PolicyCreation extends AbstractPolicyCreation{
 		                }
 					}		
 					newPolicy = new CreateBrmsParamPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("Base")) {
+				}else if ("Base".equalsIgnoreCase(policyConfigType)) {
 					newPolicy =  new ConfigPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("ClosedLoop_Fault")) {
+				}else if ("ClosedLoop_Fault".equalsIgnoreCase(policyConfigType)) {
 					newPolicy = new ClosedLoopPolicy(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("ClosedLoop_PM")) {
+				}else if ("ClosedLoop_PM".equalsIgnoreCase(policyConfigType)) {
 					if(policyData.getApiflag() == null){
 						policyData.setServiceType(policyData.getServiceTypePolicyName().get("serviceTypePolicyName").toString());
 						ObjectMapper jsonMapper = new ObjectMapper();
@@ -301,10 +304,12 @@ public class PolicyCreation extends AbstractPolicyCreation{
 						policyData.setJsonBody(jsonBody);
 					}
 					newPolicy = new CreateClosedLoopPerformanceMetrics(policyData);
-				}else if (policyConfigType.equalsIgnoreCase("Micro Service")) {
+				}else if ("Micro Service".equalsIgnoreCase(policyConfigType)) {
 					newPolicy = new MicroServiceConfigPolicy(policyData);
+				}else if ("Optimization".equalsIgnoreCase(policyConfigType)) {
+					newPolicy = new OptimizationConfigPolicy(policyData);
 				}
-			}else if(policyType.equalsIgnoreCase("Action")) {
+			}else if("Action".equalsIgnoreCase(policyType)) {
 				if(policyData.getApiflag() == null){
 					List<String> dynamicRuleAlgorithmLabels = new LinkedList<>();
 					List<String> dynamicRuleAlgorithmCombo = new LinkedList<>();
@@ -361,7 +366,7 @@ public class PolicyCreation extends AbstractPolicyCreation{
 					}
 				}
 				newPolicy = new ActionPolicy(policyData, commonClassDao);
-			} else if (policyType.equalsIgnoreCase("Decision")) {
+			} else if ("Decision".equalsIgnoreCase(policyType)) {
 				if(policyData.getApiflag() == null){
 					Map<String, String> settingsMap = new HashMap<>();
 					Map<String, String> treatmentMap = new HashMap<>();
@@ -411,6 +416,16 @@ public class PolicyCreation extends AbstractPolicyCreation{
 							String blackList = StringUtils.join(policyData.getYamlparams().getBlackList(), ",");
 							attributeMap.put("blackList", blackList);
 						}
+						if(DecisionPolicy.GUARD_BL_YAML.equals(policyData.getRuleProvider()) && "Use File Upload".equals(policyData.getBlackListEntryType())){
+							if(policyData.getBlackListEntries() != null && !policyData.getBlackListEntries().isEmpty()){
+								String blackList = StringUtils.join(policyData.getBlackListEntries(), ",");
+								attributeMap.put("blackList", blackList);
+							}
+							if(policyData.getAppendBlackListEntries() != null && !policyData.getAppendBlackListEntries().isEmpty()){
+								String blackList = StringUtils.join(policyData.getAppendBlackListEntries(), ",");
+								attributeMap.put("appendBlackList", blackList);
+							}
+						}
 						if(policyData.getYamlparams().getTargets()!=null){
 							String targets = StringUtils.join(policyData.getYamlparams().getTargets(),",");
 							attributeMap.put("targets", targets);