From 073cc188efe9abb4c010cf674e34e2cf46ef1c52 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Mon, 31 Jul 2017 08:47:35 +0000 Subject: [POLICY-73] replace openecomp for policy-engine Change-Id: I54072f6bcd388c0e05562614ee89b4ae7ad67004 Signed-off-by: Guo Ruijing Signed-off-by: Pamela Dragosh --- .../test/resources/Action_TestActionPolicy.1.xml | 2 +- .../Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml | 18 ++-- .../Config_BRMS_Raw_TestBRMSRawPolicy.1.xml | 20 ++--- .../resources/Config_FW_TestFireWallPolicy.1.xml | 14 +-- .../Config_Fault_TestClosedLoopPolicy.1.xml | 16 ++-- .../src/test/resources/Config_MS_vFirewall.1.xml | 24 ++--- .../Config_PM_TestClosedLoopPMPolicy.1.xml | 18 ++-- .../src/test/resources/Config_SampleTest1206.1.xml | 18 ++-- ...sion_TestDecisionPolicyWithRuleAlgorithms.1.xml | 8 +- ....Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt | 100 ++++++++++----------- .../com.Config_Fault_TestClosedLoopPolicy.1.json | 2 +- POLICY-SDK-APP/src/test/resources/logback.xml | 4 +- .../src/test/resources/schedulerPolicies1707.xmi | 44 ++++----- 13 files changed, 144 insertions(+), 144 deletions(-) (limited to 'POLICY-SDK-APP/src/test/resources') diff --git a/POLICY-SDK-APP/src/test/resources/Action_TestActionPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Action_TestActionPolicy.1.xml index 77c9367aa..82f02e0ff 100644 --- a/POLICY-SDK-APP/src/test/resources/Action_TestActionPolicy.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Action_TestActionPolicy.1.xml @@ -4,7 +4,7 @@ - + 12 diff --git a/POLICY-SDK-APP/src/test/resources/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml index ddf1864e4..d66704920 100644 --- a/POLICY-SDK-APP/src/test/resources/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml @@ -4,33 +4,33 @@ - + com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml - + DROOLS - + - + BRMS_PARAM_RULE - + SampleRiskType - + 1 - + False - + 08-06-2017 @@ -66,7 +66,7 @@ 1 - + DROOLS diff --git a/POLICY-SDK-APP/src/test/resources/Config_BRMS_Raw_TestBRMSRawPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_BRMS_Raw_TestBRMSRawPolicy.1.xml index aa8abc4c9..e9b38cc13 100644 --- a/POLICY-SDK-APP/src/test/resources/Config_BRMS_Raw_TestBRMSRawPolicy.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Config_BRMS_Raw_TestBRMSRawPolicy.1.xml @@ -4,33 +4,33 @@ - + com.Config_BRMS_Raw_TestBRMSRawPolicy.1.xml - + DROOLS - + - + BRMS_RAW_RULE - + High - + 2 - + True - + 08-06-2017 @@ -66,7 +66,7 @@ 1 - + DROOLS @@ -75,7 +75,7 @@ { "artifactId": "testing", - "groupId" : "org.openecomp" + "groupId" : "org.onap" } diff --git a/POLICY-SDK-APP/src/test/resources/Config_FW_TestFireWallPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_FW_TestFireWallPolicy.1.xml index f334cae46..71e3221cb 100644 --- a/POLICY-SDK-APP/src/test/resources/Config_FW_TestFireWallPolicy.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Config_FW_TestFireWallPolicy.1.xml @@ -4,29 +4,29 @@ - + com.Config_FW_TestFireWallPolicy.1.xml - + TestFireWallPolicy - + SampleRiskType - + 1 - + True - + 08-06-2017 @@ -62,7 +62,7 @@ 1 - + diff --git a/POLICY-SDK-APP/src/test/resources/Config_Fault_TestClosedLoopPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_Fault_TestClosedLoopPolicy.1.xml index 82be3420e..faeed916c 100644 --- a/POLICY-SDK-APP/src/test/resources/Config_Fault_TestClosedLoopPolicy.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Config_Fault_TestClosedLoopPolicy.1.xml @@ -4,29 +4,29 @@ - + com.Config_Fault_TestClosedLoopPolicy.1.xml - + DCAE - + - + SampleRiskType - + 1 - + True - + 07-06-2017 @@ -62,7 +62,7 @@ 1 - + DCAE diff --git a/POLICY-SDK-APP/src/test/resources/Config_MS_vFirewall.1.xml b/POLICY-SDK-APP/src/test/resources/Config_MS_vFirewall.1.xml index 4fd0b7b5c..ba3d9c215 100644 --- a/POLICY-SDK-APP/src/test/resources/Config_MS_vFirewall.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Config_MS_vFirewall.1.xml @@ -4,45 +4,45 @@ - + com.Config_MS_vFirewall.1.xml - + DCAE - + - + SampleConfigName - + TcaMetrics-v1.0.0.5 - + /services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall - + SampleServiceLocation - + SampleRiskType - + 1 - + False - + 07-06-2017 @@ -78,7 +78,7 @@ 1 - + DCAE diff --git a/POLICY-SDK-APP/src/test/resources/Config_PM_TestClosedLoopPMPolicy.1.xml b/POLICY-SDK-APP/src/test/resources/Config_PM_TestClosedLoopPMPolicy.1.xml index ca56cf4f7..370ff365f 100644 --- a/POLICY-SDK-APP/src/test/resources/Config_PM_TestClosedLoopPMPolicy.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Config_PM_TestClosedLoopPMPolicy.1.xml @@ -4,33 +4,33 @@ - + com.Config_PM_TestClosedLoopPMPolicy.1.xml - + Test - + - + SampleRiskType - + 1 - + True - + 08-06-2017 - + Registration Failure(Trinity) @@ -66,7 +66,7 @@ 1 - + Test diff --git a/POLICY-SDK-APP/src/test/resources/Config_SampleTest1206.1.xml b/POLICY-SDK-APP/src/test/resources/Config_SampleTest1206.1.xml index 5390548d9..dcfd0c5eb 100644 --- a/POLICY-SDK-APP/src/test/resources/Config_SampleTest1206.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Config_SampleTest1206.1.xml @@ -4,33 +4,33 @@ - + com.Config_SampleTest1206.1.xml - + success - + - + PROD - + 1 - + True - + 08-06-2017 - + SampleTest1206 @@ -66,7 +66,7 @@ 1 - + success diff --git a/POLICY-SDK-APP/src/test/resources/Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml b/POLICY-SDK-APP/src/test/resources/Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml index 74a0e6842..5e8dcac36 100644 --- a/POLICY-SDK-APP/src/test/resources/Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml +++ b/POLICY-SDK-APP/src/test/resources/Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml @@ -4,17 +4,17 @@ - + com.Decision_TestDecisionPolicyWithRuleAlgorithms.1.xml - + Test - + - + test diff --git a/POLICY-SDK-APP/src/test/resources/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt b/POLICY-SDK-APP/src/test/resources/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt index 955afbd0f..6ff244ea4 100644 --- a/POLICY-SDK-APP/src/test/resources/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt +++ b/POLICY-SDK-APP/src/test/resources/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt @@ -23,7 +23,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.policy.controlloop; +package org.onap.policy.controlloop; import java.util.List; import java.util.LinkedList; @@ -31,59 +31,59 @@ import java.util.Map; import java.util.HashMap; import java.util.UUID; -import org.openecomp.policy.controlloop.VirtualControlLoopEvent; -import org.openecomp.policy.controlloop.ControlLoopEventStatus; -import org.openecomp.policy.controlloop.VirtualControlLoopNotification; -import org.openecomp.policy.controlloop.ControlLoopNotificationType; -import org.openecomp.policy.controlloop.ControlLoopOperation; -import org.openecomp.policy.controlloop.ControlLoopOperationWrapper; -import org.openecomp.policy.template.demo.ControlLoopException; +import org.onap.policy.controlloop.VirtualControlLoopEvent; +import org.onap.policy.controlloop.ControlLoopEventStatus; +import org.onap.policy.controlloop.VirtualControlLoopNotification; +import org.onap.policy.controlloop.ControlLoopNotificationType; +import org.onap.policy.controlloop.ControlLoopOperation; +import org.onap.policy.controlloop.ControlLoopOperationWrapper; +import org.onap.policy.template.demo.ControlLoopException; -import org.openecomp.policy.aai.AAINQF199.AAINQF199CloudRegion; -import org.openecomp.policy.aai.AAINQF199.AAINQF199ExtraProperties; -import org.openecomp.policy.aai.AAINQF199.AAINQF199ExtraProperty; -import org.openecomp.policy.aai.AAINQF199.AAINQF199GenericVNF; -import org.openecomp.policy.aai.AAINQF199.AAINQF199InstanceFilters; -import org.openecomp.policy.aai.AAINQF199.AAINQF199InventoryResponseItem; -import org.openecomp.policy.aai.AAINQF199.AAINQF199InventoryResponseItems; -import org.openecomp.policy.aai.AAINQF199.AAINQF199Manager; -import org.openecomp.policy.aai.AAINQF199.AAINQF199NamedQuery; -import org.openecomp.policy.aai.AAINQF199.AAINQF199QueryParameters; -import org.openecomp.policy.aai.AAINQF199.AAINQF199Request; -import org.openecomp.policy.aai.AAINQF199.AAINQF199RequestWrapper; -import org.openecomp.policy.aai.AAINQF199.AAINQF199Response; -import org.openecomp.policy.aai.AAINQF199.AAINQF199ResponseWrapper; -import org.openecomp.policy.aai.AAINQF199.AAINQF199ServiceInstance; -import org.openecomp.policy.aai.AAINQF199.AAINQF199Tenant; -import org.openecomp.policy.aai.AAINQF199.AAINQF199VfModule; -import org.openecomp.policy.aai.AAINQF199.AAINQF199VServer; -import org.openecomp.policy.aai.util.Serialization; +import org.onap.policy.aai.AAINQF199.AAINQF199CloudRegion; +import org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperties; +import org.onap.policy.aai.AAINQF199.AAINQF199ExtraProperty; +import org.onap.policy.aai.AAINQF199.AAINQF199GenericVNF; +import org.onap.policy.aai.AAINQF199.AAINQF199InstanceFilters; +import org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItem; +import org.onap.policy.aai.AAINQF199.AAINQF199InventoryResponseItems; +import org.onap.policy.aai.AAINQF199.AAINQF199Manager; +import org.onap.policy.aai.AAINQF199.AAINQF199NamedQuery; +import org.onap.policy.aai.AAINQF199.AAINQF199QueryParameters; +import org.onap.policy.aai.AAINQF199.AAINQF199Request; +import org.onap.policy.aai.AAINQF199.AAINQF199RequestWrapper; +import org.onap.policy.aai.AAINQF199.AAINQF199Response; +import org.onap.policy.aai.AAINQF199.AAINQF199ResponseWrapper; +import org.onap.policy.aai.AAINQF199.AAINQF199ServiceInstance; +import org.onap.policy.aai.AAINQF199.AAINQF199Tenant; +import org.onap.policy.aai.AAINQF199.AAINQF199VfModule; +import org.onap.policy.aai.AAINQF199.AAINQF199VServer; +import org.onap.policy.aai.util.Serialization; -import org.openecomp.policy.appc.CommonHeader; -import org.openecomp.policy.appc.Request; -import org.openecomp.policy.appc.Response; -import org.openecomp.policy.appc.ResponseCode; -import org.openecomp.policy.appc.ResponseStatus; -import org.openecomp.policy.appc.ResponseValue; +import org.onap.policy.appc.CommonHeader; +import org.onap.policy.appc.Request; +import org.onap.policy.appc.Response; +import org.onap.policy.appc.ResponseCode; +import org.onap.policy.appc.ResponseStatus; +import org.onap.policy.appc.ResponseValue; -import org.openecomp.policy.template.demo.EventManager; -import org.openecomp.policy.vnf.trafficgenerator.PGRequest; -import org.openecomp.policy.vnf.trafficgenerator.PGStream; -import org.openecomp.policy.vnf.trafficgenerator.PGStreams; +import org.onap.policy.template.demo.EventManager; +import org.onap.policy.vnf.trafficgenerator.PGRequest; +import org.onap.policy.vnf.trafficgenerator.PGStream; +import org.onap.policy.vnf.trafficgenerator.PGStreams; -import org.openecomp.policy.mso.MSOManager; -import org.openecomp.policy.mso.MSORequest; -import org.openecomp.policy.mso.MSORequestStatus; -import org.openecomp.policy.mso.MSORequestDetails; -import org.openecomp.policy.mso.MSOModelInfo; -import org.openecomp.policy.mso.MSOCloudConfiguration; -import org.openecomp.policy.mso.MSORequestInfo; -import org.openecomp.policy.mso.MSORequestParameters; -import org.openecomp.policy.mso.MSORelatedInstanceListElement; -import org.openecomp.policy.mso.MSORelatedInstance; -import org.openecomp.policy.mso.MSOResponse; +import org.onap.policy.mso.MSOManager; +import org.onap.policy.mso.MSORequest; +import org.onap.policy.mso.MSORequestStatus; +import org.onap.policy.mso.MSORequestDetails; +import org.onap.policy.mso.MSOModelInfo; +import org.onap.policy.mso.MSOCloudConfiguration; +import org.onap.policy.mso.MSORequestInfo; +import org.onap.policy.mso.MSORequestParameters; +import org.onap.policy.mso.MSORelatedInstanceListElement; +import org.onap.policy.mso.MSORelatedInstance; +import org.onap.policy.mso.MSOResponse; -import org.openecomp.policy.drools.system.PolicyEngine; +import org.onap.policy.drools.system.PolicyEngine; // // These parameters are required to build the runtime policy @@ -106,7 +106,7 @@ end /* * * Called once and only once to insert the parameters into working memory for this Closed Loop policy. -* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there) +* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there) * * *rule "BRMSParamvFWDemoPolicy.SETUP" diff --git a/POLICY-SDK-APP/src/test/resources/com.Config_Fault_TestClosedLoopPolicy.1.json b/POLICY-SDK-APP/src/test/resources/com.Config_Fault_TestClosedLoopPolicy.1.json index f7e25ca47..dbd3649c0 100644 --- a/POLICY-SDK-APP/src/test/resources/com.Config_Fault_TestClosedLoopPolicy.1.json +++ b/POLICY-SDK-APP/src/test/resources/com.Config_Fault_TestClosedLoopPolicy.1.json @@ -1 +1 @@ -{"trinity":false,"vUSP":true,"mcr":false,"gama":false,"vDNS":false,"vnfType":"SampleVNF","vServices":null,"closedLoopPolicyStatus":"Active","triggerSignatures":{"signatures":"((NOT(NOT(1.0.2.3)AND(1.0.2.3)), Time = 11)AND((NOT(1.0.2.3)AND(1.0.2.3)), Time = 12))","timeWindow":11,"trapMaxAge":12},"actions":"SampleVSCL","timeInterval":11,"timeOutvPRO":11,"timeOutRuby":11,"retrys":1,"agingWindow":1,"geoLink":"TEST","emailAddress":"aa@test.con","verificationSignatures":{"signatures":"(NOT(1.0.2.3)AND(1.0.2.3))","timeWindow":12},"conditions":"SEND","triggerSignaturesUsedForUI":{"signatures":"NOT@!SampleVarbind@!AND@!SampleVarbind#!?!NOT@!SampleVarbind@!OR@!SampleVarbind#!NOT@!A1@!AND@!SampleVarbind#!NOT@!A1@!AND@!A2#!?!","connectSignatures":"NOT@!Trap1@!11@!AND@!Trap1@!12#!?!"},"verificationSignaturesUsedForUI":{"signatures":"NOT@!SampleVarbind@!AND@!SampleVarbind#!?!","connectSignatures":null},"triggerTimeWindowUsedForUI":11,"verfificationTimeWindowUsedForUI":12,"pepName":null,"pepAction":null,"templateVersion":null,"trapMaxAgeUsedForUI":12,"ecompname":null} +{"trinity":false,"vUSP":true,"mcr":false,"gama":false,"vDNS":false,"vnfType":"SampleVNF","vServices":null,"closedLoopPolicyStatus":"Active","triggerSignatures":{"signatures":"((NOT(NOT(1.0.2.3)AND(1.0.2.3)), Time = 11)AND((NOT(1.0.2.3)AND(1.0.2.3)), Time = 12))","timeWindow":11,"trapMaxAge":12},"actions":"SampleVSCL","timeInterval":11,"timeOutvPRO":11,"timeOutRuby":11,"retrys":1,"agingWindow":1,"geoLink":"TEST","emailAddress":"aa@test.con","verificationSignatures":{"signatures":"(NOT(1.0.2.3)AND(1.0.2.3))","timeWindow":12},"conditions":"SEND","triggerSignaturesUsedForUI":{"signatures":"NOT@!SampleVarbind@!AND@!SampleVarbind#!?!NOT@!SampleVarbind@!OR@!SampleVarbind#!NOT@!A1@!AND@!SampleVarbind#!NOT@!A1@!AND@!A2#!?!","connectSignatures":"NOT@!Trap1@!11@!AND@!Trap1@!12#!?!"},"verificationSignaturesUsedForUI":{"signatures":"NOT@!SampleVarbind@!AND@!SampleVarbind#!?!","connectSignatures":null},"triggerTimeWindowUsedForUI":11,"verfificationTimeWindowUsedForUI":12,"pepName":null,"pepAction":null,"templateVersion":null,"trapMaxAgeUsedForUI":12,"onapname":null} diff --git a/POLICY-SDK-APP/src/test/resources/logback.xml b/POLICY-SDK-APP/src/test/resources/logback.xml index b119a4e3b..3e5f1b6a6 100644 --- a/POLICY-SDK-APP/src/test/resources/logback.xml +++ b/POLICY-SDK-APP/src/test/resources/logback.xml @@ -1,6 +1,6 @@ + ::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC" --> diff --git a/POLICY-SDK-APP/src/test/resources/schedulerPolicies1707.xmi b/POLICY-SDK-APP/src/test/resources/schedulerPolicies1707.xmi index 22afa23a2..2288ae718 100644 --- a/POLICY-SDK-APP/src/test/resources/schedulerPolicies1707.xmi +++ b/POLICY-SDK-APP/src/test/resources/schedulerPolicies1707.xmi @@ -2,61 +2,61 @@ Content-Disposition: form-data; name="file"; filename="schedulerPolicies1707.xmi" - + -
-
+
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -64,48 +64,48 @@ Content-Disposition: form-data; name="file"; filename="schedulerPolicies1707.xmi - +
- +
- +
- +
- +
- +
- +
- +
- +
-- cgit 1.2.3-korg