diff options
Diffstat (limited to 'ECOMP-ControlloopPolicy/src/main/java')
3 files changed, 22 insertions, 15 deletions
diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java b/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java index 85ddf066d..42a04e7b7 100644 --- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java +++ b/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/Constraint.java @@ -77,6 +77,13 @@ public class Constraint { this.blacklist = new LinkedList<>(blacklist); } + + public Constraint(Map<String, String> time_in_range, List<String> blacklist) { + if (time_in_range != null) { + this.time_in_range = Collections.unmodifiableMap(time_in_range); + } + this.blacklist = new LinkedList<>(blacklist); + } public Constraint(Integer num, String duration, List<String> blacklist) { this.num = num; @@ -84,6 +91,13 @@ public class Constraint { this.blacklist = new LinkedList<>(blacklist); } + public Constraint(Integer num, String duration, Map<String, String> time_in_range) { + this(num, duration); + if (time_in_range != null) { + this.time_in_range = Collections.unmodifiableMap(time_in_range); + } + } + public Constraint(Integer num, String duration, Map<String, String> time_in_range, List<String> blacklist) { this(num, duration); if (time_in_range != null) { @@ -102,13 +116,7 @@ public class Constraint { } public boolean isValid() { - if (num == null && duration != null) { - return false; - } - if (duration == null && num != null) { - return false; - } - return true; + return ((num == null && duration != null)|| (duration == null && num != null))? false : true; } @Override diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuard.java b/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuard.java index cfc904823..3df2a0885 100644 --- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuard.java +++ b/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/ControlLoopGuard.java @@ -20,13 +20,12 @@ package org.openecomp.policy.controlloop.policy.guard; import java.util.LinkedList; -import java.util.List; public class ControlLoopGuard { private Guard guard; - private List<GuardPolicy> guards; + private LinkedList<GuardPolicy> guards; public ControlLoopGuard() { //DO Nothing Empty Constructor @@ -40,11 +39,11 @@ public class ControlLoopGuard { this.guard = guard; } - public List<GuardPolicy> getGuards() { + public LinkedList<GuardPolicy> getGuards() { return guards; } - public void setGuards(List<GuardPolicy> guards) { + public void setGuards(LinkedList<GuardPolicy> guards) { this.guards = guards; } diff --git a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/GuardPolicy.java b/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/GuardPolicy.java index 7eb8af6d1..a4d56ff07 100644 --- a/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/GuardPolicy.java +++ b/ECOMP-ControlloopPolicy/src/main/java/org/openecomp/policy/controlloop/policy/guard/GuardPolicy.java @@ -31,7 +31,7 @@ public class GuardPolicy { private String description; private String actor; private String recipe; - private List<Constraint> limit_constraints; + private LinkedList<Constraint> limit_constraints; public GuardPolicy() { //Do Nothing Empty Constructor. @@ -77,11 +77,11 @@ public class GuardPolicy { this.recipe = recipe; } - public List<Constraint> getLimit_constraints() { - return limit_constraints; + public LinkedList<Constraint> getLimit_constraints() { + return limit_constraints; } - public void setLimit_constraints(List<Constraint> limit_constraints) { + public void setLimit_constraints(LinkedList<Constraint> limit_constraints) { this.limit_constraints = limit_constraints; } |