[Policy-52, Policy-92, Policy-93] Policy Enhancements and bugfixes

[policy/engine.git] / ECOMP-PAP-REST / src / main / java / org / openecomp / policy / pap / xacml / rest / components / SafePolicyBuilder.java

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/SafePolicyBuilder.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/SafePolicyBuilder.java
index c4f5358..bd69a88 100644 (file)
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/SafePolicyBuilder.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/SafePolicyBuilder.java
@@ -30,11 +30,11 @@ import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
 public class SafePolicyBuilder {
-
+       
        private SafePolicyBuilder(){
                //Private Constructor. 
        }
-       
+
        public static ControlLoopGuard loadYamlGuard(String specification) {
                //
                // Read the yaml into our Java Object
@@ -45,7 +45,20 @@ public class SafePolicyBuilder {
                return (ControlLoopGuard) obj;
        }
        
-       public static String generateXacmlGuard(String xacmlFileContent,Map<String, String> generateMap, List<String> blacklist) {
+       public static String generateXacmlGuard(String xacmlFileContent,Map<String, String> generateMap, List<String> blacklist, List<String> targets) {
+               //Setup default values and Targets. 
+               StringBuilder targetRegex= new StringBuilder(".*|");
+               if(targets!=null && !targets.isEmpty()){
+                       targetRegex = new StringBuilder();
+            for(String t : targets){
+               targetRegex.append(t + "|");
+            }
+               }
+               if(generateMap.get("clname")==null|| generateMap.get("clname").isEmpty()){
+                       generateMap.put("clname",".*");
+               }
+               generateMap.put("targets", targetRegex.toString().substring(0, targetRegex.length()-1));
+               // Replace values. 
                for(Map.Entry<String,String> map: generateMap.entrySet()){
                        Pattern p = Pattern.compile("\\$\\{" +map.getKey() +"\\}");
                        Matcher m = p.matcher(xacmlFileContent);