diff options
7 files changed, 6 insertions, 155 deletions
diff --git a/.gitignore b/.gitignore index 3852641d2..46f3928ab 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ XACML-PDP-REST/catalina.base_IS_UNDEFINED/logs/Policy/XACML-PDP-REST/error.log XACML-PDP-REST/catalina.base_IS_UNDEFINED/logs/Policy/XACML-PDP-REST/metrics.log XACML-REST/IntegrityMonitor.log /bin/ +*.checkstyle diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java index 45f803f5a..53d801b5b 100644 --- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java +++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java @@ -72,7 +72,6 @@ import org.onap.policy.common.logging.eelf.MessageCodes; import org.onap.policy.common.logging.eelf.PolicyLogger; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; -import org.onap.policy.pap.xacml.rest.components.AutoPushPolicy; import org.onap.policy.pap.xacml.rest.components.PolicyDBDao; import org.onap.policy.pap.xacml.rest.components.PolicyDBDaoTransaction; import org.onap.policy.pap.xacml.rest.handler.APIRequestHandler; @@ -161,7 +160,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList private static Integer papAuditTimeout = null; private static Boolean papAuditFlag = null; private static Boolean papFileSystemAudit = null; - private static Boolean autoPushFlag = false; private static String papResourceName = null; private static Integer fpMonitorInterval = null; private static Integer failedCounterThreshold = null; @@ -187,7 +185,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList */ private Thread initiateThread = null; private ONAPLoggingContext baseLoggingContext = null; - private AutoPushPolicy autoPushPolicy; /** * @see HttpServlet#HttpServlet() @@ -266,24 +263,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList //Boolean will default to false if anything is missing or unrecognized papAuditFlag = Boolean.parseBoolean(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_RUN_AUDIT_FLAG)); papFileSystemAudit = Boolean.parseBoolean(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_AUDIT_FLAG)); - //PAP Auto Push - autoPushFlag = Boolean.parseBoolean(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PUSH_FLAG)); - // if Auto push then Load with properties. - if(autoPushFlag){ - String file; - try{ - file = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PUSH_FILE); - if(file.endsWith(".properties")){ - autoPushPolicy = new AutoPushPolicy(file); - }else{ - throw new PAPException(); - } - }catch(Exception e){ - PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " Missing property or not a proper property file check for: " + XACMLRestProperties.PROP_PAP_PUSH_FILE ); - LOGGER.info("Overriding the autoPushFlag to False..."); - autoPushFlag = false; - } - } papDependencyGroups = XACMLProperties.getProperty(XACMLRestProperties.PAP_DEPENDENCY_GROUPS); if(papDependencyGroups == null){ throw new PAPException("papDependencyGroups is null"); @@ -326,7 +305,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList + "\n papAuditTimeout = " + papAuditTimeout + "\n papAuditFlag = " + papAuditFlag + "\n papFileSystemAudit = " + papFileSystemAudit - + "\n autoPushFlag = " + autoPushFlag + "\n papResourceName = " + papResourceName + "\n fpMonitorInterval = " + fpMonitorInterval + "\n failedCounterThreshold = " + failedCounterThreshold diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java deleted file mode 100644 index f9dbc287b..000000000 --- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java +++ /dev/null @@ -1,100 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP-PAP-REST - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.pap.xacml.rest.components; - -import java.io.File; -import java.io.FileInputStream; -import java.nio.file.Paths; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Properties; -import java.util.Set; - -import org.onap.policy.common.logging.eelf.MessageCodes; -import org.onap.policy.common.logging.eelf.PolicyLogger; -import org.onap.policy.common.logging.flexlogger.FlexLogger; -import org.onap.policy.common.logging.flexlogger.Logger; -import org.onap.policy.xacml.std.pap.StdPDPGroup; -import org.onap.policy.xacml.std.pap.StdPDPPolicy; - -import com.att.research.xacml.api.pap.PDPPolicy; -/** - * Auto Push Policy based on the property file properties. - * - * @version 0.1 - */ -public class AutoPushPolicy { - - private static final Logger LOGGER = FlexLogger.getLogger(AutoPushPolicy.class); - - private String filePath = null; - private Properties properties; - private Long newModified; - private Long oldModified; - private File propFile; - - - /** - * Constructor Pass in the property file path. - */ - public AutoPushPolicy(String file){ - filePath = file; - properties = new Properties(); - propFile = Paths.get(filePath).toFile(); - readFile(); - } - - private void readFile(){ - try { - properties.load(new FileInputStream(propFile)); - oldModified = propFile.lastModified(); - } catch (Exception e) { - PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW, e, "AutoPushPolicy", "Error while loading in the auto push properties file."); - } - } - - private StdPDPGroup addToGroup(String policyId, String policyName, String policyToCreateUpdate, StdPDPGroup pdpGroup) throws Exception{ - // Add to group. Send Notification. - StdPDPPolicy policy = new StdPDPPolicy(policyId, true, policyName, null); - //Get the current policies from the Group and Add the new one - Set<PDPPolicy> currentPoliciesInGroup = pdpGroup.getPolicies(); - Set<PDPPolicy> policies = new HashSet<>(); - policies.add(policy); - pdpGroup.copyPolicyToFile(policyId, new FileInputStream(Paths.get(policyToCreateUpdate).toFile())); - //If the selected policy is in the group we must remove it because the name is default - Iterator<PDPPolicy> policyIterator = policies.iterator(); - while (policyIterator.hasNext()) { - PDPPolicy selPolicy = policyIterator.next(); - for (PDPPolicy existingPolicy : currentPoliciesInGroup) { - if (existingPolicy.getId().equals(selPolicy.getId())) { - pdpGroup.removePolicyFromGroup(existingPolicy); - LOGGER.debug("Removing policy: " + existingPolicy); - break; - } - } - } - if(currentPoliciesInGroup!=null){ - policies.addAll(currentPoliciesInGroup); - } - pdpGroup.setPolicies(policies); - return pdpGroup; - } -} diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java index 708794d60..26509b1aa 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java @@ -21,7 +21,8 @@ package org.onap.policy.pap.xacml.rest.controller; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -32,29 +33,20 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; -import javax.json.Json; -import javax.json.JsonObject; import javax.servlet.http.HttpServletRequest; -import org.json.JSONObject; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; -import org.onap.policy.rest.adapter.PolicyRestAdapter; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.Attribute; import org.onap.policy.rest.jpa.MicroServiceModels; import org.onap.policy.rest.jpa.PolicyEditorScopes; import org.springframework.mock.web.MockHttpServletResponse; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.fge.jackson.JsonLoader; - /** * The class <code>DictionaryControllerTest</code> contains tests * for the class {@link <code>DictionaryController</code>}* @@ -68,18 +60,15 @@ public class DictionaryControllerTest { private static Logger logger = FlexLogger.getLogger(DictionaryControllerTest.class); private static CommonClassDao commonClassDao; private String jsonString = null; - private String configBodyString = null; private HttpServletRequest request = null; private DictionaryController controller = null; - private BufferedReader br = null; @Before public void setUp() throws Exception { logger.info("setUp: Entering"); commonClassDao = Mockito.mock(CommonClassDao.class); HttpServletRequest request = Mockito.mock(HttpServletRequest.class); - - List<Object> microServiceModelsData = new ArrayList<Object>(); + MicroServiceModels testData = new MicroServiceModels(); testData.setVersion("1707.4.1.2-Junit"); @@ -102,11 +91,6 @@ public class DictionaryControllerTest { + " \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\"," + " \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, " + " \"policyJSON\": {\"pmTableName\": \"test\", \"dmdTopic\": \"1\",\"fileId\": \"56\"} }"; - - configBodyString = "{\"service\":\"SniroPolicyEntityTest\",\"policyName\":\"someone\",\"description\":\"test\",\"templateVersion\":\"1607\",\"version\":\"HD\"," - + "\"priority\":\"2\",\"content\":{\"lastPolled\":\"1\",\"boolen-test\":\"true\",\"created\":\"test\",\"retiredDate\":\"test\",\"scope\":\"SNIRO_PLACEMENT_VDHV\"," - + "\"name\":\"test\",\"lastModified\":\"test\",\"state\":\"CREATED\",\"type\":\"CONFIG\",\"intent\":\"test\",\"target\":\"SNIRO\"}}"; - request = mock(HttpServletRequest.class); BufferedReader br = new BufferedReader(new StringReader(jsonString)); //--- mock the getReader() call diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java index c66ace11e..e307820e5 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java @@ -63,7 +63,6 @@ public class MicroServiceDictionaryControllerTest { private static Logger logger = FlexLogger.getLogger(MicroServiceDictionaryControllerTest.class); private static CommonClassDao commonClassDao; private String jsonString = null; - private String configBodyString = null; private HttpServletRequest request = null; private MicroServiceDictionaryController controller = null; BufferedReader br = null; @@ -106,10 +105,6 @@ public class MicroServiceDictionaryControllerTest { + " \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\"," + " \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, " + " \"policyJSON\": {\"pmTableName\": \"test\", \"dmdTopic\": \"1\",\"fileId\": \"56\"} }"; - - configBodyString = "{\"service\":\"SniroPolicyEntityTest\",\"policyName\":\"someone\",\"description\":\"test\",\"templateVersion\":\"1607\",\"version\":\"HD\"," - + "\"priority\":\"2\",\"content\":{\"lastPolled\":\"1\",\"boolen-test\":\"true\",\"created\":\"test\",\"retiredDate\":\"test\",\"scope\":\"SNIRO_PLACEMENT_VDHV\"," - + "\"name\":\"test\",\"lastModified\":\"test\",\"state\":\"CREATED\",\"type\":\"CONFIG\",\"intent\":\"test\",\"target\":\"SNIRO\"}}"; br = new BufferedReader(new StringReader(jsonString)); //--- mock the getReader() call diff --git a/ONAP-PAP-REST/xacml.pap.properties b/ONAP-PAP-REST/xacml.pap.properties index b0fa954a8..2517ebdcc 100644 --- a/ONAP-PAP-REST/xacml.pap.properties +++ b/ONAP-PAP-REST/xacml.pap.properties @@ -29,8 +29,7 @@ dictionary.impl.className=org.onap.policy.pap.xacml.rest.handler.DictionaryHandl 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 -#AutoPush Policy -xacml.rest.pap.autopush.file=autopush.properties + #=====================================================================================# #===============The Below Properties will be changed based on Environment=============# #=====================================================================================# @@ -109,9 +108,6 @@ xacml.rest.pap.notify.timeoutms=10000 #the number of times an incoming policy update notification will be tried to be processed (or until it succeeds) xacml.rest.pap.incomingnotification.tries=4 -#AutoPush Policy Flag -xacml.rest.pap.autopush.flag=false - #***Properties for IntegrityMonitor integration defined in XACMLRestProperties.java*** #The name of the PAP. Must be unique across the system 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 5646cf4b0..2a14641e9 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 @@ -104,10 +104,7 @@ xacml.rest.pap.run.audit.flag=${{PROP_PAP_RUN_AUDIT_FLAG}} # 1.The file system can duplicate the database: database>file system (set property to true) # 2.The database can duplicate the file system: file system>database (set property to false) xacml.rest.pap.filesystem.audit=${{PROP_PAP_AUDIT_FLAG}} -#AutoPush Policy Flag -xacml.rest.pap.autopush.flag=false -#AutoPush Policy -xacml.rest.pap.autopush.file=autopush.properties + #Patter to identify if a attribute is ready. Currently just a place holder xacm.xcor.required.pattern=1,1 #the number of times an incoming policy update notification will be tried to be processed (or until it succeeds) |