diff options
Diffstat (limited to 'PolicyEngineClient/src/main/java')
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/ActionPolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ActionPolicyClient.java) | 12 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsParamPolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsParamPolicyClient.java) | 12 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsRawPolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsRawPolicyClient.java) | 14 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyClient.java) | 12 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java) | 12 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigBasePolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigBasePolicyClient.java) | 16 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigFirewallPolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigFirewallPolicyClient.java) | 12 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/DecisionPolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DecisionPolicyClient.java) | 14 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/DeletePolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DeletePolicyClient.java) | 10 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/GeneralTestClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java) | 28 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/GetConfigSample.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GetConfigSample.java) | 8 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/Handler.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/Handler.java) | 26 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportBRMSTemplate.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportBRMSTemplate.java) | 10 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportMicroServiceClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportMicroServiceClient.java) | 10 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/ListConfigPoliciesClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ListConfigPoliciesClient.java) | 16 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/MainClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MainClient.java) | 22 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/MicroServicesPolicyClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MicroServicesPolicyClient.java) | 14 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/PolicyEngineTestClient.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PolicyEngineTestClient.java) | 48 | ||||
| -rw-r--r-- | PolicyEngineClient/src/main/java/org/onap/policyEngine/PushPoliciesToPDP.java (renamed from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PushPoliciesToPDP.java) | 8 |
19 files changed, 152 insertions, 152 deletions
diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ActionPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ActionPolicyClient.java index d1081b106..fa04668ca 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ActionPolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ActionPolicyClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.util.Arrays; import java.util.HashMap; @@ -27,11 +27,11 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.openecomp.policy.api.AttributeType; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyClass; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; +import org.onap.policy.api.AttributeType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyClass; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; public class ActionPolicyClient { static Boolean isEdit = true; diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsParamPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsParamPolicyClient.java index 5810106c1..04cfdb84a 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsParamPolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsParamPolicyClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.text.SimpleDateFormat; import java.util.Date; @@ -26,11 +26,11 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.openecomp.policy.api.AttributeType; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyConfigType; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; +import org.onap.policy.api.AttributeType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyConfigType; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; public class BrmsParamPolicyClient { diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsRawPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsRawPolicyClient.java index c144e1989..bf8fea59f 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/BrmsRawPolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/BrmsRawPolicyClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.BufferedReader; import java.io.File; @@ -32,12 +32,12 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.openecomp.policy.api.AttributeType; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyConfigType; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; -import org.openecomp.policy.api.PolicyType; +import org.onap.policy.api.AttributeType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyConfigType; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; +import org.onap.policy.api.PolicyType; public class BrmsRawPolicyClient { static Boolean isEdit = true; diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyClient.java index a54030b94..2240f0b73 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.File; import java.io.FileInputStream; @@ -36,11 +36,11 @@ import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonReader; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyConfigType; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; -import org.openecomp.policy.api.PolicyType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyConfigType; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; +import org.onap.policy.api.PolicyType; public class ClosedLoopPolicyClient { //For updating a ClosedLoop_Fault policy set the "isEdit" flag to true. diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java index 9564cdefe..e3b5fde60 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ClosedLoopPolicyPerformanceMetricClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.File; import java.io.FileInputStream; @@ -36,11 +36,11 @@ import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonReader; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyConfigType; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; -import org.openecomp.policy.api.PolicyType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyConfigType; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; +import org.onap.policy.api.PolicyType; public class ClosedLoopPolicyPerformanceMetricClient { diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigBasePolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigBasePolicyClient.java index a3903806c..20a5bd359 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigBasePolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigBasePolicyClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.text.SimpleDateFormat; import java.util.Date; @@ -26,12 +26,12 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.openecomp.policy.api.AttributeType; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyConfigType; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; -import org.openecomp.policy.api.PolicyType; +import org.onap.policy.api.AttributeType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyConfigType; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; +import org.onap.policy.api.PolicyType; public class ConfigBasePolicyClient{ static Boolean isEdit = false; @@ -43,7 +43,7 @@ public class ConfigBasePolicyClient{ policyParameters.setPolicyConfigType(PolicyConfigType.Base); //required policyParameters.setPolicyName("MikeConsole.testDeleteAPI6"); //required policyParameters.setPolicyDescription("This is a sample Config Base policy creation example"); //optional - policyParameters.setEcompName("DCAE"); //required + policyParameters.setOnapName("DCAE"); //required policyParameters.setConfigName("testBase"); //required policyParameters.setConfigBodyType(PolicyType.OTHER); //required policyParameters.setConfigBody("testing"); //required diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigFirewallPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigFirewallPolicyClient.java index a6b3119f9..a261761f5 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ConfigFirewallPolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ConfigFirewallPolicyClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.File; import java.io.FileInputStream; @@ -36,11 +36,11 @@ import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonReader; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyConfigType; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; -import org.openecomp.policy.api.PolicyType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyConfigType; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; +import org.onap.policy.api.PolicyType; public class ConfigFirewallPolicyClient { static Boolean isEdit = false; diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DecisionPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/DecisionPolicyClient.java index 428a2ca03..8c16e0e40 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DecisionPolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/DecisionPolicyClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.util.Arrays; import java.util.HashMap; @@ -27,11 +27,11 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.openecomp.policy.api.AttributeType; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyClass; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; +import org.onap.policy.api.AttributeType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyClass; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; public class DecisionPolicyClient { static Boolean isEdit = true; @@ -42,7 +42,7 @@ public class DecisionPolicyClient { // Set Policy Type policyParameters.setPolicyClass(PolicyClass.Decision); //required policyParameters.setPolicyName("MikeAPItests.testDecisionAPI"); //required - policyParameters.setEcompName("java"); //required + policyParameters.setOnapName("java"); //required policyParameters.setPolicyDescription("This is a sample Decision policy UPDATE example with Settings"); //optional //policyParameters.setPolicyScope("MikeAPItests"); //Directory will be created where the Policies are saved... this displays a a subscope on the GUI diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DeletePolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/DeletePolicyClient.java index 79ec99f85..ec4959550 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/DeletePolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/DeletePolicyClient.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; -import org.openecomp.policy.api.DeletePolicyCondition; -import org.openecomp.policy.api.DeletePolicyParameters; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyEngine; +import org.onap.policy.api.DeletePolicyCondition; +import org.onap.policy.api.DeletePolicyParameters; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyEngine; public class DeletePolicyClient { diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GeneralTestClient.java index 4298e8167..423ade2c2 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GeneralTestClient.java @@ -28,7 +28,7 @@ * Unpublished and Not for Publication * All Rights Reserved */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.FileNotFoundException; import java.io.FileReader; @@ -45,10 +45,10 @@ import java.util.Map; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyEngineException; -import org.openecomp.policy.common.logging.flexlogger.FlexLogger; -import org.openecomp.policy.common.logging.flexlogger.Logger; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyEngineException; +import org.onap.policy.common.logging.flexlogger.FlexLogger; +import org.onap.policy.common.logging.flexlogger.Logger; /** * Class reads from .testCases file and run the test cases available in the file @@ -102,7 +102,7 @@ public class GeneralTestClient { * @param file */ private static void runTestClientOnConfigFile(Path file) { - String resultReturned, eCOMPComponentName; + String resultReturned, onapComponentName; int totalTCforFile = 0, passTCforFile = 0, failTCforFile = 0; System.out .println("\n###############################################################################################"); @@ -151,8 +151,8 @@ public class GeneralTestClient { switch (testFor) { case "getConfig": - eCOMPComponentName = (String) testCase - .get("ECOMPName"); + onapComponentName = (String) testCase + .get("ONAPName"); String configName = (String) testCase .get("ConfigName"); Map<String, String> configAttributes = new HashMap<>(); @@ -172,7 +172,7 @@ public class GeneralTestClient { configAttributes = null; } resultReceived = PolicyEngineTestClient.getConfig( - policyEngine, eCOMPComponentName, + policyEngine, onapComponentName, configName, configAttributes); Collections.sort(expectedResult); Collections.sort(resultReceived); @@ -226,8 +226,8 @@ public class GeneralTestClient { break; case "getDecision": - eCOMPComponentName = (String) testCase - .get("ECOMPName"); + onapComponentName = (String) testCase + .get("ONAPName"); Map<String, String> decisionAttributes = new HashMap<>(); decisionAttributes.put("Key", "Value"); JSONArray decisionAttributesJSON = (JSONArray) testCase @@ -243,7 +243,7 @@ public class GeneralTestClient { resultReceived = PolicyEngineTestClient .getDecision(policyEngine, - eCOMPComponentName, + onapComponentName, decisionAttributes); Collections.sort(expectedResult); Collections.sort(resultReceived); @@ -264,11 +264,11 @@ public class GeneralTestClient { // case "getManualNotification": // PolicyEngineTestClient - // .getManualNotifications(org.openecomp.policyEngine); + // .getManualNotifications(org.onap.policyEngine); // break; // case "getAutoNotification": // PolicyEngineTestClient - // .getAutoNotifications(org.openecomp.policyEngine); + // .getAutoNotifications(org.onap.policyEngine); // break; default: diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GetConfigSample.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GetConfigSample.java index cdba1c9fe..59225ce6f 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GetConfigSample.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GetConfigSample.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.util.Collection; -import org.openecomp.policy.api.ConfigRequestParameters; -import org.openecomp.policy.api.PolicyConfig; -import org.openecomp.policy.api.PolicyEngine; +import org.onap.policy.api.ConfigRequestParameters; +import org.onap.policy.api.PolicyConfig; +import org.onap.policy.api.PolicyEngine; public class GetConfigSample { diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/Handler.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/Handler.java index ea11f9d8d..4a78db615 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/Handler.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/Handler.java @@ -18,22 +18,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.util.Collection; -import org.openecomp.policy.api.LoadedPolicy; -import org.openecomp.policy.api.NotificationHandler; -import org.openecomp.policy.api.NotificationType; -import org.openecomp.policy.api.PDPNotification; -import org.openecomp.policy.api.PolicyConfig; -import org.openecomp.policy.api.PolicyConfigException; -import org.openecomp.policy.api.PolicyConfigStatus; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyEngineException; -import org.openecomp.policy.api.RemovedPolicy; -import org.openecomp.policy.common.logging.flexlogger.FlexLogger; -import org.openecomp.policy.common.logging.flexlogger.Logger; +import org.onap.policy.api.LoadedPolicy; +import org.onap.policy.api.NotificationHandler; +import org.onap.policy.api.NotificationType; +import org.onap.policy.api.PDPNotification; +import org.onap.policy.api.PolicyConfig; +import org.onap.policy.api.PolicyConfigException; +import org.onap.policy.api.PolicyConfigStatus; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyEngineException; +import org.onap.policy.api.RemovedPolicy; +import org.onap.policy.common.logging.flexlogger.FlexLogger; +import org.onap.policy.common.logging.flexlogger.Logger; public class Handler implements NotificationHandler{ diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportBRMSTemplate.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportBRMSTemplate.java index bb34c4985..053c524b6 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportBRMSTemplate.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportBRMSTemplate.java @@ -1,12 +1,12 @@ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.File; import java.util.UUID; -import org.openecomp.policy.api.ImportParameters; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE; +import org.onap.policy.api.ImportParameters; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.ImportParameters.IMPORT_TYPE; public class ImportBRMSTemplate { public static void main(String[] args) { diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportMicroServiceClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportMicroServiceClient.java index 70e79805e..671eb6c80 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ImportMicroServiceClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ImportMicroServiceClient.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.util.UUID; -import org.openecomp.policy.api.ImportParameters; -import org.openecomp.policy.api.ImportParameters.IMPORT_TYPE; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyEngine; +import org.onap.policy.api.ImportParameters; +import org.onap.policy.api.ImportParameters.IMPORT_TYPE; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyEngine; public class ImportMicroServiceClient { static Boolean isEdit = false; diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ListConfigPoliciesClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ListConfigPoliciesClient.java index 497ff84a1..dd5c97ba1 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/ListConfigPoliciesClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/ListConfigPoliciesClient.java @@ -18,19 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.openecomp.policy.api.ConfigRequestParameters; -import org.openecomp.policy.api.PolicyConfigException; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyEngineException; -import org.openecomp.policy.common.logging.flexlogger.FlexLogger; -import org.openecomp.policy.common.logging.flexlogger.Logger; +import org.onap.policy.api.ConfigRequestParameters; +import org.onap.policy.api.PolicyConfigException; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyEngineException; +import org.onap.policy.common.logging.flexlogger.FlexLogger; +import org.onap.policy.common.logging.flexlogger.Logger; public class ListConfigPoliciesClient { @@ -45,7 +45,7 @@ public class ListConfigPoliciesClient { ConfigRequestParameters parameters = new ConfigRequestParameters(); parameters.setPolicyName(".*"); - parameters.setEcompName(".*"); + parameters.setOnapName(".*"); parameters.setConfigName(".*"); Map<String, String> configAttributes = new HashMap<>(); diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MainClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/MainClient.java index d17f0c649..0be702c13 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MainClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/MainClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.IOException; import java.io.OutputStream; @@ -34,15 +34,15 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.openecomp.policy.api.LoadedPolicy; -import org.openecomp.policy.api.NotificationScheme; -import org.openecomp.policy.api.PolicyConfig; -import org.openecomp.policy.api.PolicyConfigException; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyEngineException; -import org.openecomp.policy.api.RemovedPolicy; -import org.openecomp.policy.common.logging.flexlogger.FlexLogger; -import org.openecomp.policy.common.logging.flexlogger.Logger; +import org.onap.policy.api.LoadedPolicy; +import org.onap.policy.api.NotificationScheme; +import org.onap.policy.api.PolicyConfig; +import org.onap.policy.api.PolicyConfigException; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyEngineException; +import org.onap.policy.api.RemovedPolicy; +import org.onap.policy.common.logging.flexlogger.FlexLogger; +import org.onap.policy.common.logging.flexlogger.Logger; import org.w3c.dom.Document; public class MainClient { @@ -67,7 +67,7 @@ public class MainClient { // Config Example try { @SuppressWarnings("deprecation") - Collection<PolicyConfig> policyConfigs = policyEngine.getConfigByPolicyName(".*");//(eCOMPComponentName, configName, configAttributes); + Collection<PolicyConfig> policyConfigs = policyEngine.getConfigByPolicyName(".*");//(onapComponentName, configName, configAttributes); if(policyConfigs!=null && !policyConfigs.isEmpty()){ for(PolicyConfig policyConfig: policyConfigs){ System.out.println("\nConfig Message: "+ policyConfig.getPolicyConfigMessage()); diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MicroServicesPolicyClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/MicroServicesPolicyClient.java index 4c6756a5b..99f9551cb 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/MicroServicesPolicyClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/MicroServicesPolicyClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.File; import java.io.FileInputStream; @@ -35,11 +35,11 @@ import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonReader; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyConfigType; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyParameters; -import org.openecomp.policy.api.PolicyType; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyConfigType; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyParameters; +import org.onap.policy.api.PolicyType; public class MicroServicesPolicyClient { //For updating a Micro Services policy set the "isEdit" flag to true. @@ -79,7 +79,7 @@ public static void main(String[] args) { policyParameters.setPolicyConfigType(PolicyConfigType.MicroService); policyParameters.setPolicyName("Katrina.configuration_dcae_microservice_stringmatcher"); //policyParameters.setPolicyDescription("This is a sample Micro Service policy Create example"); - policyParameters.setEcompName("DCAE"); + policyParameters.setOnapName("DCAE"); //policyParameters.setConfigName("Collector"); //policyParameters.setPriority("1"); //policyParameters.setPolicyScope("service=vSCP;resource=F5;type=configuration;closedLoopControlName=vSCP_F5_Firewall_d925ed73-8231-4d02-9545-db4e113213abab322"); diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PolicyEngineTestClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/PolicyEngineTestClient.java index a56145214..4f782c8c9 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PolicyEngineTestClient.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/PolicyEngineTestClient.java @@ -28,7 +28,7 @@ * Unpublished and Not for Publication * All Rights Reserved */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; import java.io.IOException; import java.util.ArrayList; @@ -36,16 +36,16 @@ import java.util.Collection; import java.util.Map; import java.util.UUID; -import org.openecomp.policy.api.DecisionResponse; -import org.openecomp.policy.api.LoadedPolicy; -import org.openecomp.policy.api.NotificationScheme; -import org.openecomp.policy.api.PolicyConfig; -import org.openecomp.policy.api.PolicyConfigException; -import org.openecomp.policy.api.PolicyDecisionException; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PolicyEventException; -import org.openecomp.policy.api.PolicyResponse; -import org.openecomp.policy.api.RemovedPolicy; +import org.onap.policy.api.DecisionResponse; +import org.onap.policy.api.LoadedPolicy; +import org.onap.policy.api.NotificationScheme; +import org.onap.policy.api.PolicyConfig; +import org.onap.policy.api.PolicyConfigException; +import org.onap.policy.api.PolicyDecisionException; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PolicyEventException; +import org.onap.policy.api.PolicyResponse; +import org.onap.policy.api.RemovedPolicy; /** * Class contains static functions which make call to policy engine using API. @@ -60,8 +60,8 @@ public class PolicyEngineTestClient { * This fuction make API call to policy engine to get config. And returns * policy name, policy version and policy configStatus * - * @param org.openecomp.policyEngine - * @param eCOMPComponentName + * @param org.onap.policyEngine + * @param onapComponentName * @param configName * @param configAttributes * @return @@ -69,21 +69,21 @@ public class PolicyEngineTestClient { @SuppressWarnings("deprecation") public static ArrayList<String> getConfig(PolicyEngine policyEngine, - String eCOMPComponentName, String configName, + String onapComponentName, String configName, Map<String, String> configAttributes) { ArrayList<String> resultReceived = new ArrayList<>(); try { UUID requestID = UUID.randomUUID(); Collection<PolicyConfig> policyConfigs; if (configName == null) { - policyConfigs = policyEngine.getConfig(eCOMPComponentName, requestID); + policyConfigs = policyEngine.getConfig(onapComponentName, requestID); } else { if (configAttributes == null) { - policyConfigs = policyEngine.getConfig(eCOMPComponentName, + policyConfigs = policyEngine.getConfig(onapComponentName, configName, requestID); } else { - policyConfigs = policyEngine.getConfig(eCOMPComponentName, + policyConfigs = policyEngine.getConfig(onapComponentName, configName, configAttributes, requestID); } } @@ -107,20 +107,20 @@ public class PolicyEngineTestClient { * This functions make API call to policy engine to get decision. And * returns policy Decision * - * @param org.openecomp.policyEngine - * @param eCOMPComponentName + * @param org.onap.policyEngine + * @param onapComponentName * @param decisionAttributes * @return */ public static ArrayList<String> getDecision(PolicyEngine policyEngine, - String eCOMPComponentName, Map<String, String> decisionAttributes) { + String onapComponentName, Map<String, String> decisionAttributes) { ArrayList<String> resultReceived = new ArrayList<>(); // Decision example try { UUID requestID = UUID.randomUUID(); @SuppressWarnings("deprecation") DecisionResponse policyDecision = policyEngine.getDecision( - eCOMPComponentName, decisionAttributes, requestID); + onapComponentName, decisionAttributes, requestID); resultReceived.add(policyDecision.getDecision().toString()); } catch (PolicyDecisionException e) { // logger.error("Exception Occured"+e); @@ -133,7 +133,7 @@ public class PolicyEngineTestClient { * This function makes API call to policy engine to get action. And returns * responseMessage and responseStatus * - * @param org.openecomp.policyEngine + * @param org.onap.policyEngine * @param eventAttributes * @return */ @@ -164,7 +164,7 @@ public class PolicyEngineTestClient { * This function makes API call to policy engine to get manual * notifications. * - * @param org.openecomp.policyEngine + * @param org.onap.policyEngine */ public static void getManualNotifications(PolicyEngine policyEngine) { @@ -186,7 +186,7 @@ public class PolicyEngineTestClient { * This function makes API call to policy engine to get automatic * notifications. * - * @param org.openecomp.policyEngine + * @param org.onap.policyEngine */ public static void getAutoNotifications(PolicyEngine policyEngine) { Handler handler = new Handler(); diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PushPoliciesToPDP.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/PushPoliciesToPDP.java index 2a4086357..05d736464 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/PushPoliciesToPDP.java +++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/PushPoliciesToPDP.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policyEngine; +package org.onap.policyEngine; -import org.openecomp.policy.api.PolicyChangeResponse; -import org.openecomp.policy.api.PolicyEngine; -import org.openecomp.policy.api.PushPolicyParameters; +import org.onap.policy.api.PolicyChangeResponse; +import org.onap.policy.api.PolicyEngine; +import org.onap.policy.api.PushPolicyParameters; public class PushPoliciesToPDP { public static void main(String[] args) { |