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 --- .../install/servers/pap/bin/autopush.properties | 2 +- .../servers/pap/bin/config/policyLogger.properties | 2 +- ....Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml | 18 ++++++++-------- ....Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml | 18 ++++++++-------- .../bin/pdps/default/com.Config_MS_vFirewall.1.xml | 24 +++++++++++----------- .../pdps/default/com.Config_MS_vLoadBalancer.1.xml | 24 +++++++++++----------- .../pap/bin/pdps/default/xacml.pip.properties | 2 +- .../files/install/servers/pap/bin/pip.properties | 4 ++-- .../install/servers/pap/bin/policyelk.properties | 2 +- .../files/install/servers/pap/bin/test.properties | 2 +- .../install/servers/pap/bin/xacml.pap.properties | 14 ++++++------- ....Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt | 4 ++-- ....Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt | 8 ++++---- 13 files changed, 62 insertions(+), 62 deletions(-) (limited to 'packages/base/src/files/install/servers/pap') diff --git a/packages/base/src/files/install/servers/pap/bin/autopush.properties b/packages/base/src/files/install/servers/pap/bin/autopush.properties index 8d780842f..134ff5dab 100644 --- a/packages/base/src/files/install/servers/pap/bin/autopush.properties +++ b/packages/base/src/files/install/servers/pap/bin/autopush.properties @@ -1,6 +1,6 @@ ### # ============LICENSE_START======================================================= -# ECOMP Policy Engine +# ONAP Policy Engine # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties index 0deb1b3d6..bbb0ecf4e 100644 --- a/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties +++ b/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties @@ -1,6 +1,6 @@ ### # ============LICENSE_START======================================================= -# ECOMP Policy Engine +# ONAP Policy Engine # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml index 33c0c4a8d..e27f163b6 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml @@ -4,33 +4,33 @@ - + com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml - + DROOLS - + - + BRMS_PARAM_RULE - + SampleRiskType - + 1 - + False - + NA @@ -66,7 +66,7 @@ 1 - + DROOLS diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml index 290146240..54bcbaaf0 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml @@ -4,33 +4,33 @@ - + com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml - + DROOLS - + - + BRMS_PARAM_RULE - + SampleRiskType - + 1 - + False - + NA @@ -66,7 +66,7 @@ 1 - + DROOLS diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml index a18b59f41..ca01be5a7 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.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 - + NA @@ -78,7 +78,7 @@ 1 - + DCAE diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml index 03ae3e806..663f4f3c5 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml @@ -4,45 +4,45 @@ - + com.Config_MS_vLoadBalancer.1.xml - + DCAE - + - + SampleConfigName - + TcaMetrics-v1.0.0.5 - + /services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer - + SampleServiceLocation - + SampleRiskType - + 1 - + False - + NA @@ -78,7 +78,7 @@ 1 - + DCAE diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties b/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties index 4dba1f554..846848f28 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties @@ -1,6 +1,6 @@ # #Tue Feb 07 10:35:08 EST 2017 AAF.description=AAFEngine to communicate with AAF to take decisions -AAF.classname=org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine +AAF.classname=org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine AAF.name=AAFEngine xacml.pip.engines=AAF \ No newline at end of file diff --git a/packages/base/src/files/install/servers/pap/bin/pip.properties b/packages/base/src/files/install/servers/pap/bin/pip.properties index d9df903e4..b5d46af57 100644 --- a/packages/base/src/files/install/servers/pap/bin/pip.properties +++ b/packages/base/src/files/install/servers/pap/bin/pip.properties @@ -5,11 +5,11 @@ xacml.pip.engines=AAF,historydb ### AAF PIP Configuration. AAF.description=AAFEngine to communicate with AAF to take decisions -AAF.classname=org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine +AAF.classname=org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine AAF.name=AAFEngine # PIP Engine Definition # -historydb.classname=org.openecomp.policy.xacml.std.pip.engines.OperationHistoryEngine +historydb.classname=org.onap.policy.xacml.std.pip.engines.OperationHistoryEngine historydb.issuer=org:onap:xacml:guard:historydb historydb.name=operationHistoryDB \ No newline at end of file diff --git a/packages/base/src/files/install/servers/pap/bin/policyelk.properties b/packages/base/src/files/install/servers/pap/bin/policyelk.properties index 88fa7d7d0..4071e99dd 100644 --- a/packages/base/src/files/install/servers/pap/bin/policyelk.properties +++ b/packages/base/src/files/install/servers/pap/bin/policyelk.properties @@ -1,6 +1,6 @@ ### # ============LICENSE_START======================================================= -# ECOMP Policy Engine +# ONAP Policy Engine # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/packages/base/src/files/install/servers/pap/bin/test.properties b/packages/base/src/files/install/servers/pap/bin/test.properties index e983c3b7c..993c7e8ec 100644 --- a/packages/base/src/files/install/servers/pap/bin/test.properties +++ b/packages/base/src/files/install/servers/pap/bin/test.properties @@ -1,6 +1,6 @@ ### # ============LICENSE_START======================================================= -# ECOMP Policy Engine +# ONAP Policy Engine # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties b/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties index 3e30bde80..5646cf4b0 100644 --- a/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties +++ b/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties @@ -1,6 +1,6 @@ ### # ============LICENSE_START======================================================= -# ECOMP Policy Engine +# ONAP Policy Engine # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ @@ -21,11 +21,11 @@ # # This is our factory that will create our engine # -xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory -dictionary.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DictionaryHandlerImpl -savePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.SavePolicyHandler -pushPolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.PushPolicyHandler -deletePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DeleteHandler +xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory +dictionary.impl.className=org.onap.policy.pap.xacml.rest.handler.DictionaryHandlerImpl +savePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.SavePolicyHandler +pushPolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.PushPolicyHandler +deletePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.DeleteHandler # # Where we store our PAP PDP Group/Node information # @@ -137,5 +137,5 @@ integrity_audit_period_seconds=${{integrity_audit_period_seconds}} ENVIRONMENT=${{ENVIRONMENT}} #Micro Service Model Properties -xacml.policy.msEcompName=${{policy_msEcompName}} +xacml.policy.msOnapName=${{policy_msOnapName}} xacml.policy.msPolicyName=${{policy_msPolicyName}} \ No newline at end of file diff --git a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt index c731b3f77..6ff244ea4 100755 --- a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt +++ b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt @@ -83,7 +83,7 @@ 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/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt index 77408a227..f9accdd96 100755 --- a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt +++ b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt @@ -83,7 +83,7 @@ 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 "BRMSParamvLBDemoPolicy.SETUP" @@ -119,7 +119,7 @@ end * params.setAaiURL("https://aai.api.simpledemo.openecomp.org:8443"); * params.setAaiUsername("POLICY"); * params.setAaiPassword("POLICY"); -* params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra"); +* params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/onap/mso/infra"); * params.setMsoUsername("InfraPortalClient"); * params.setMsoPassword("password1$"); * params.setAaiNamedQueryUUID("f199cb88-5e69-4b1f-93e0-6f257877d066"); @@ -1135,7 +1135,7 @@ rule "com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.Params" params.setMsoPassword("password1$"); params.setClosedLoopControlName("CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8"); params.setAaiUsername("POLICY"); - params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra"); + params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/onap/mso/infra"); params.setActor("MSO"); params.setMsoUsername("InfraPortalClient"); params.setAaiNamedQueryUUID("f199cb88-5e69-4b1f-93e0-6f257877d066"); -- cgit 1.2.3-korg