From 7e547eaa55920dfbc9691eab33bb728395b50cf2 Mon Sep 17 00:00:00 2001 From: Ravindra Bakkamanthala Date: Mon, 15 May 2017 12:53:18 -0400 Subject: Policy TestSuite Enabled Change-Id: I9f98c7dcdcf98713d73544956d873a84fc82adf7 Signed-off-by: Ravindra Bakkamanthala --- .../java/org/openecomp/policy/api/PolicyConfigType.java | 4 +++- .../java/org/openecomp/policy/api/PolicyParameters.java | 13 +++++++++++-- .../main/java/org/openecomp/policy/std/AutoClientEnd.java | 2 +- .../java/org/openecomp/policy/std/ManualClientEndUEB.java | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) (limited to 'PolicyEngineAPI/src/main/java/org') diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigType.java b/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigType.java index 7b3ca2f23..028696462 100644 --- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigType.java +++ b/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyConfigType.java @@ -56,7 +56,9 @@ public enum PolicyConfigType{ /** * Indicates DCAE Micro Service based Policy. */ - MicroService("MS") + MicroService("MS"), + + Extended("EXTENDED") ; private String name; diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyParameters.java b/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyParameters.java index 489408863..0f34de0d1 100644 --- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyParameters.java +++ b/PolicyEngineAPI/src/main/java/org/openecomp/policy/api/PolicyParameters.java @@ -56,7 +56,8 @@ public class PolicyParameters { private Date TTLDate; private boolean guard = false; private String riskLevel = "5"; - private String riskType = "defualt"; + private String riskType = "default"; + private String extendedOption; /** * Sets Config Policy Parameters. @@ -536,13 +537,21 @@ public class PolicyParameters { this.dependencyNames = dependencyNames; } + public String getExtendedOption() { + return extendedOption; + } + + public void setExtendedOption(String extendedOption) { + this.extendedOption = extendedOption; + } + public String toString() { return "PolicyParameters [ policyName=" + policyName + ", policyDescription=" + policyDescription + ", ecompName="+ ecompName + ", configName=" + configName + ", attributes=" + attributes + ", configBody=" + configBody + ",dynamicRuleAlgorithmLabels=" + dynamicRuleAlgorithmLabels + ",dynamicRuleAlgorithmFunctions=" + dynamicRuleAlgorithmFunctions + ",dynamicRuleAlgorithmField1=" + dynamicRuleAlgorithmField1 + ",dynamicRuleAlgorithmField2=" + dynamicRuleAlgorithmField2 + ", actionPerformer=" + actionPerformer + ", actionAttribute=" + actionAttribute + ", priority=" + priority - + ", ruleProvider= " + ruleProvider + ", riskLevel= " + riskLevel + ", riskType= " + riskType + + ", ruleProvider= " + ruleProvider + ", riskLevel= " + riskLevel + ", riskType= " + riskType + ", extendedOption= " + extendedOption + "]"; } } diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientEnd.java b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientEnd.java index 9ca544fc9..d7ec9ac43 100644 --- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientEnd.java +++ b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/AutoClientEnd.java @@ -191,7 +191,7 @@ public class AutoClientEnd { public void onError(Session session, Throwable e) { // trying to Restart by self. logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Session Error.. "+ session.getId() + "\n Error is : " + e ); - // e.printStackTrace(); + // logger.error("Exception Occured"+e); stop(); if (url != null) { client = null; diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEndUEB.java b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEndUEB.java index 398e8d51f..f2a6a96d8 100644 --- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEndUEB.java +++ b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/ManualClientEndUEB.java @@ -102,7 +102,7 @@ public class ManualClientEndUEB { try { pub.send ( "MyPartitionKey", msg1.toString () ); } catch (IOException e) { - e.printStackTrace(); + logger.error("Exception Occured"+e); } pub.close (); -- cgit 1.2.3-korg