[Policy-20] getConfig & Policy resolved blockers

Change-Id: If08e4c90d419e8d6e1426d817a12dde5b7cafba3
Signed-off-by: rb7147 <rb7147@att.com>

4 files changed, 236 insertions, 47 deletions

diff --git a/LogParser/src/test/java/org/openecomp/xacml/parser/ParseLogTest.java b/LogParser/src/test/java/org/openecomp/xacml/parser/ParseLogTest.java
index 621f39742..2bd70f2be 100644
--- a/LogParser/src/test/java/org/openecomp/xacml/parser/ParseLogTest.java
+++ b/LogParser/src/test/java/org/openecomp/xacml/parser/ParseLogTest.java
@@ -21,6 +21,7 @@
 package org.openecomp.xacml.parser;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
@@ -38,15 +39,19 @@ import org.mockito.Mockito;
 import org.openecomp.policy.common.im.AdministrativeStateException;
 import org.openecomp.policy.common.im.IntegrityMonitor;
 import org.openecomp.policy.common.im.StandbyStatusException;
+import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
+import org.openecomp.policy.common.logging.flexlogger.Logger;
 import org.openecomp.xacml.parser.LogEntryObject.LOGTYPE;
 
 
 public class ParseLogTest {
-
+	
+	private static Logger logger = FlexLogger.getLogger(ParseLogTest.class);
 	private Properties config = new Properties();
-	private String configFile = "test_config.properties";
+	private String configFile;
+	private String testFile1;
+	private String testFile2;
 	private IntegrityMonitor im;
-
 	
 	@Before
 	public void setUp() throws Exception {
@@ -59,41 +64,56 @@ public class ParseLogTest {
 			fail();
 		}
 		Mockito.doNothing().when(im).endTransaction();
-
+		ClassLoader classLoader = getClass().getClassLoader();
+		configFile = classLoader.getResource("test_config.properties").getFile();
+		if(configFile.startsWith("/C:/")){
+			configFile = configFile.substring(1);
+		}
+		testFile1 = classLoader.getResource("LineTest.txt").getFile();
+		testFile2 = classLoader.getResource("LineTest2.txt").getFile();
+		
 	}
 
 	@After
 	public void tearDown() {
+		
+		logger.debug("tearDown: enter");
+		
 		File file = new File("nonExistFile.txt");
 		file.delete();
-	}
-
-	//@Test
-	public void testMain() {
-		try {	
-			ParseLog.main(null);
-		} catch (Exception e) {
-			fail();
-		}
+		logger.debug("tearDown: exit");
 	}
 
 	@Test
 	public void testCountLines() throws IOException {
-		String fileName = "LineTest.txt";
-		int returnValue = ParseLog.countLines(fileName);
 		
-		assertEquals(9, returnValue);
+		logger.debug("testCountLines: enter");
+		
+		int returnValue = ParseLog.countLines(testFile1);
+		logger.debug("testCountLines: returnValue: " + returnValue);
+		assertEquals(12, returnValue);
+		
+		logger.debug("testCountLines: exit");
 	}
-	
+
 	@Test
 	public void testParseRemoteSystem() {
+		
+		logger.debug("testParseRemoteSystem: enter");
+		
 		String line = "||org.openecomp.policy.pap.xacml.rest.XACMLPapServlet$Heartbeat.run(XACMLPapServlet.java:2801)||Heartbeat 'https://localhost:8081/pdp/' status='UP_TO_DATE'";
 		String returnValue = ParseLog.parseRemoteSystem(line);
+		logger.debug("testParseRemoteSystem: returnValue: " + returnValue);
 		assertEquals("localhost:8081", returnValue);
+		
+		logger.debug("testParseRemoteSystem: exit");
 	}
 
 	@Test
 	public void testGetPropertiesValue() {
+		
+		logger.debug("testGetPropertiesValue: enter");
+		
 		config = new Properties();
 		config.put("RESOURCE_NAME", "logparser_pap01");
 		config.put("JDBC_DRIVER" ,"com.mysql.jdbc.Driver");
@@ -108,76 +128,123 @@ public class ParseLogTest {
 		config.put("PARSERLOGPATH", "IntegrityMonitor.log");
 		
 		Properties returnConfig = ParseLog.getPropertiesValue(configFile);
-
-		
+		logger.debug("testGetPropertiesValue: returnConfig: " + returnConfig);
 		assertEquals(config.get("RESOURCE_NAME"), returnConfig.get("RESOURCE_NAME"));	
+		
+		logger.debug("testGetPropertiesValue: exit");
 	}
-	
+
 	@Test
 	public void testGetPropertiesFail() {	
-		Properties returnValue = ParseLog.getPropertiesValue("nonExistFile");
 		
+		logger.debug("testGetPropertiesFail: enter");
+		
+		Properties returnValue = ParseLog.getPropertiesValue("nonExistFile");
+		logger.debug("testGetPropertiesFail: returnValue: " + returnValue);
 		assertEquals(null, returnValue);	
+		
+		logger.debug("testGetPropertiesFail: exit");
 	}
 
 	@Test
 	public  void  testParseDate(){
+		
+		logger.debug("testParseDate: enter");
+		
 		String line = "2016-02-23 08:07:30";
 		Date returnValue = ParseLog.parseDate(line, "yyyy-MM-dd HH:mm:ss", false);
+		logger.debug("testParseDate: returnValue: " + returnValue);
 		line = returnValue.toString().substring(0, returnValue.toString().lastIndexOf(":30")+3);
 		assertEquals("Tue Feb 23 08:07:30", line);
+		
+		logger.debug("testParseDate: exit");
 	}
-	
+
 	@Test
 	public  void  testParseDateFail(){
+		
+		logger.debug("testParseDateFail: enter");
+		
 		String line = "2016-02-23 08:07:30";
 		Date returnValue = ParseLog.parseDate(line, "yyyy-MM-dd HH:mm:ss", true);
-		
+		logger.debug("testParseDateFail: returnValue: " + returnValue);
 		assertEquals(null, returnValue);
+		
+		logger.debug("testParseDateFail: exit");
 	}
-	
+
 	@Test
 	public void testPullLastLineRead(){
 		
-		File file = new File("LineTest.txt");
+		logger.debug("testPullLastLineRead: enter");
+		File file = new File(testFile1);
 		String returnValue = null;
 		try {
-			returnValue = ParseLog.PullLastLineRead(file).trim();
+			returnValue = ParseLog.PullLastLineRead(file, "pap-rest.log");
+			logger.debug("testPullLastLineRead: returnValue for pap-rest.log: " + returnValue);
+		} catch (IOException e) {
+			fail();
+		}		
+		assertEquals("52", returnValue);
+		
+		try {
+			returnValue = ParseLog.PullLastLineRead(file, "debug.log");
+			logger.debug("testPullLastLineRead: returnValue for debug.log: " + returnValue);
 		} catch (IOException e) {
 			fail();
 		}		
-		assertEquals("12", returnValue);
+		assertEquals("17", returnValue);
+		
+		try {
+			returnValue = ParseLog.PullLastLineRead(file, "error.log");
+			logger.debug("testPullLastLineRead: returnValue for error.log: " + returnValue);
+		} catch (IOException e) {
+			fail();
+		}		
+		assertEquals("22", returnValue);
 
+		logger.debug("testPullLastLineRead: exit");
 	}
-	
+
 	@Test
 	public void testPullLastLineReadNoFile(){
 		
+		logger.debug("testPullLastLineReadNoFile: enter");
+		
 		File file = new File("nonExistFile.txt");
 		try {
-			assertEquals(null, ParseLog.PullLastLineRead(file));
+			assertEquals(null, ParseLog.PullLastLineRead(file, "pap-rest"));
 		} catch (IOException e) {
 			fail();
 		}
+		
+		logger.debug("testPullLastLineReadNoFile: exit");
 	}
+
 	@Test
 	public void testPullLastLineReadFail(){
 		
-		File file = new File("LineTest2.txt");
+		logger.debug("testPullLastLineReadFail: enter");
+		
+		File file = new File(testFile2);
 		try {
-			assertEquals(null, ParseLog.PullLastLineRead(file));
+			assertEquals(null, ParseLog.PullLastLineRead(file, "pap-rest"));
 		} catch (IOException e) {
 			fail();
 		}
+		
+		logger.debug("testPullLastLineReadFail: exit");
 	}
 
 	@Test
 	public void testPullOutLogValues(){
+		
+		logger.debug("testPullOutLogValues: enter");
 		//ERROR_VALUE
 		// Open the file
 		FileInputStream fstream;
 		try {
-			fstream = new FileInputStream("LineTest.txt");
+			fstream = new FileInputStream(testFile1);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fstream));
 			String strLine = br.readLine();
 			LogEntryObject retrunObject = ParseLog.pullOutLogValues(strLine, "ERROR");
@@ -186,15 +253,47 @@ public class ParseLogTest {
 		} catch (IOException e) {
 			fail();
 		}	
-//		assert(true);
+
+		logger.debug("testPullOutLogValues: exit");
 	}
+	
+	@Test
+	public void testGetPaths(){
+		
+		logger.debug("testGetPaths: enter");
+		
+		try {
+			// valid test
+			String logPaths = "C:\\pap-log\\pap-rest.log;C:\\pap-log\\debug.log;C:\\pap-log\\error.log";
+			String [] retrunObject = ParseLog.getPaths(logPaths);
+			assertEquals(3, retrunObject.length);
+			
+			// valid test
+			logPaths = "C:\\pap-log\\pap-rest.log";
+			retrunObject = ParseLog.getPaths(logPaths);
+			assertEquals(1, retrunObject.length);
+			
+			// invalid test
+			logPaths = "";
+			retrunObject = ParseLog.getPaths(logPaths);
+			assertTrue(retrunObject == null);
+
+		} catch (Exception e) {
+			fail();
+		}	
+
+		logger.debug("testGetPaths: exit");
+	}	
+
 	@Test
 	public void testPullOutLogValuesSecond(){
+		
+		logger.debug("testPullOutLogValuesSecond: enter");
 		//ERROR_VALUE
 		// Open the file
 		FileInputStream fstream;
 		try {
-			fstream = new FileInputStream("LineTest.txt");
+			fstream = new FileInputStream(testFile1);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fstream));
 			String strLine = br.readLine();
 			strLine = br.readLine();
@@ -204,16 +303,20 @@ public class ParseLogTest {
 		} catch (IOException e) {
 			fail();
 		}	
+		
+		logger.debug("testPullOutLogValuesSecond: exit");
 	}
-	
+
 	@Test
 	public void testPullOutLogValuesThird(){
+		
+		logger.debug("testPullOutLogValuesThird: enter");
 		//ERROR_VALUE
 		// Open the file
 		FileInputStream fstream;
 		try {
 			int number = 3;
-			fstream = new FileInputStream("LineTest.txt");
+			fstream = new FileInputStream(testFile1);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fstream));
 			String strLine = br.readLine();
 			for (int i =0; i < number; i++){
@@ -225,15 +328,19 @@ public class ParseLogTest {
 		} catch (IOException e) {
 			fail();
 		}	
+		
+		logger.debug("testPullOutLogValuesThird: exit");
 	}
 
 	@Test
 	public void testPullOutLogValuesFourth(){
+		
+		logger.debug("testPullOutLogValuesFourth: enter");
 		// Open the file
 		FileInputStream fstream;
 		try {
 			int number = 4;
-			fstream = new FileInputStream("LineTest.txt");
+			fstream = new FileInputStream(testFile1);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fstream));
 			String strLine = br.readLine();
 			for (int i =0; i < number; i++){
@@ -245,15 +352,19 @@ public class ParseLogTest {
 		} catch (IOException e) {
 			fail();
 		}	
+		
+		logger.debug("testPullOutLogValuesFourth: exit");
 	}
-	
+
 	@Test
 	public void testPullOutLogValuesFith(){
+		
+		logger.debug("testPullOutLogValuesFith: enter");
 		// Open the file
 		FileInputStream fstream;
 		try {
 			int number = 5;
-			fstream = new FileInputStream("LineTest.txt");
+			fstream = new FileInputStream(testFile1);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fstream));
 			String strLine = br.readLine();
 			for (int i =0; i < number; i++){
@@ -265,15 +376,19 @@ public class ParseLogTest {
 		} catch (IOException e) {
 			fail();
 		}	
+		
+		logger.debug("testPullOutLogValuesFith: exit");
 	}
-	
+
 	@Test
 	public void testPullOutLogValuesSixth(){
+		
+		logger.debug("testPullOutLogValuesSixth: enter");
 		// Open the file
 		FileInputStream fstream;
 		try {
 			int number = 6;
-			fstream = new FileInputStream("LineTest.txt");
+			fstream = new FileInputStream(testFile1);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fstream));
 			String strLine = br.readLine();
 			for (int i =0; i < number; i++){
@@ -285,15 +400,19 @@ public class ParseLogTest {
 		} catch (IOException e) {
 			fail();
 		}	
+		
+		logger.debug("testPullOutLogValuesSixth: exit");
 	}
 
 	@Test
 	public void testPullOutLogValuesSeven(){
+		
+		logger.debug("testPullOutLogValuesSeven: enter");
 		// Open the file
 		FileInputStream fstream;
 		try {
 			int number = 7;
-			fstream = new FileInputStream("LineTest.txt");
+			fstream = new FileInputStream(testFile1);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fstream));
 			String strLine = br.readLine();
 			for (int i =0; i < number; i++){
@@ -305,15 +424,19 @@ public class ParseLogTest {
 		} catch (IOException e) {
 			fail();
 		}	
+		
+		logger.debug("testPullOutLogValuesSeven: exit");
 	}
-	
+
 	@Test
 	public void testPullOutLogValuesEight(){
+		
+		logger.debug("testPullOutLogValuesEight: enter");
 		// Open the file
 		FileInputStream fstream;
 		try {
 			int number = 8;
-			fstream = new FileInputStream("LineTest.txt");
+			fstream = new FileInputStream(testFile1);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fstream));
 			String strLine = br.readLine();
 			for (int i =0; i < number; i++){
@@ -325,17 +448,26 @@ public class ParseLogTest {
 		} catch (IOException e) {
 			fail();
 		}	
+		
+		logger.debug("testPullOutLogValuesEight: exit");
 	}
-	
+
 	@Test
 	public void testPullOutLogValuesNull(){
+		
+		logger.debug("testPullOutLogValuesNull: enter");
 		// Open the file
 		LogEntryObject retrunObject = ParseLog.pullOutLogValues("", "Console");
 		assertEquals(null, retrunObject);
+		
+		logger.debug("testPullOutLogValuesNull: exit");
 	}
-	
+
 	@Test
 	public void testLogEntryObject(){
+		
+		logger.debug("testLogEntryObject: enter");
+		
 		Date date = new Date();
 	 
 		// Open the file
@@ -349,10 +481,15 @@ public class ParseLogTest {
 		assertEquals("pap", logObject.getSystemType());
 		assertEquals(date, logObject.getDate());
 		assertEquals("remote", logObject.getRemote());
+		
+		logger.debug("testLogEntryObject: exit");
 	}
 
 	@Test
 	public void testProcess(){
+		
+		logger.debug("testProcess: enter");
+		
 		String line = "2015-04-01 09:13:44.947  DEBUG 17482 --- [nio-8480-exec-7] c.a.l.ecomp.policy.std.StdPolicyConfig   : config Retrieved ";
 	
 		im = Mockito.mock(IntegrityMonitor.class);
@@ -362,6 +499,8 @@ public class ParseLogTest {
 			fail();
 		}
 		Mockito.doNothing().when(im).endTransaction();
-		ParseLog.process(line, "pap");
+		ParseLog.process(line, "pap", LOGTYPE.INFO);
+		
+		logger.debug("testProcess: exit");
 	}
 }
\ No newline at end of file
diff --git a/LogParser/src/test/resources/LineTest.txt b/LogParser/src/test/resources/LineTest.txt
new file mode 100644
index 000000000..32ec6cb0e
--- /dev/null
+++ b/LogParser/src/test/resources/LineTest.txt
@@ -0,0 +1,12 @@
+2016-04-26T00:00:00{GMT+0}+00:00|||Thread-5||||ERROR|||localhost.com||org.openecomp.policy.im.IntegrityMonitor.writeFpc(IntegrityMonitor.java:377)||ERROR_VALUE
+2016-04-27T11:22:08{GMT+0}+00:00|||main||||INFO|||||org.openecomp.xacml.parser.ParseLog.main(ParseLog.java:86)||File Line Count: 18409 value read in: 0
+2016-04-27T11:22:48{GMT+0}+00:00|||Thread-0||||INFO|||||org.openecomp.xacml.parser.ParseLog$1.lambda$0(ParseLog.java:96)||Last line Read: 12
+2015_10_02_15_11_19_006 [http-nio-8081-exec-10] INFO  corg.openecomp.research.xacml.rest.XACMLPdpServlet.doPutConfig(XACMLPdpServlet.java:409)- Success
+2015-04-01 09:13:44.947  INFO 17482 --- [nio-8480-exec-7] c.a.l.ecomp.policy.std.StdPolicyConfig   : config Retrieved 
+08-Apr-2015 10:31:26.503 WARNING [localhost-startStop-2] org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web application [PyPDPServer] appears to have started a thread named [Grizzly(1) SelectorRunner] but has failed to stop it. This is very likely to create a memory leak. service Catalina08-Apr-2015 10:31:26.503 WARNING [localhost-startStop-2] org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web application [PyPDPServer] appears to have started a thread named [Grizzly(1) SelectorRunner] but has failed to stop it. This is very likely to create a memory leak. 
+06-Mar-2015 11:50:06.243 SEVERE [main] org.apache.coyote.AbstractProtocol.init Failed to initialize end point associated with ProtocolHandler ["ajp-nio-8009"] java.net.BindException: Address already in use
+2015_09_30_10_39_31_675 [http-nio-8081-exec-1] ERROR org.openecomp.research.xacml.rest.XACMLPdpServlet.doPost(XACMLPdpServlet.java:644)- PE100 - Permissions Error: PEP not Authorized for making this Request!! 
+2015_03_17_15_01_08_348 [qtp1688376486-32] WARN  org.openecomp.research.xacml.admin.components.PolicyManagement$1.accept(PolicyManagement.java:184)- Filtering out: C:\git\D2PE-take2\policy-engine-prototype\XACML-PAP-ADMIN\workspace\admin\repository\com\.svnignore
+2017-05-31T22:18:42{GMT+0}+00:00|||Thread-4||||INFO|||||org.openecomp.xacml.parser.ParseLog$1.lambda$0(ParseLog.java:136)||Last-debug.log-line-Read:17
+2017-05-31T22:18:42{GMT+0}+00:00|||Thread-5||||INFO|||||org.openecomp.xacml.parser.ParseLog$2.lambda$0(ParseLog.java:194)||Last-error.log-line-Read:22
+2017-05-31T22:18:42{GMT+0}+00:00|||Thread-6||||INFO|||||org.openecomp.xacml.parser.ParseLog$3.lambda$0(ParseLog.java:250)||Last-pap-rest.log-line-Read:52
\ No newline at end of file
diff --git a/LogParser/src/test/resources/LineTest2.txt b/LogParser/src/test/resources/LineTest2.txt
new file mode 100644
index 000000000..2243960df
--- /dev/null
+++ b/LogParser/src/test/resources/LineTest2.txt
@@ -0,0 +1,7 @@
+2016-04-26T00:00:00{GMT+0}+00:00|||Thread-5||||ERROR|||localhost.com||org.openecomp.ecomp.policy.im.IntegrityMonitor.writeFpc(IntegrityMonitor.java:377)||ERROR_VALUE
+2015_10_02_15_11_19_006 [http-nio-8081-exec-10] INFO  org.openecomp.research.xacml.rest.XACMLPdpServlet.doPutConfig(XACMLPdpServlet.java:409)- Success
+2015-04-01 09:13:44.947  INFO 17482 --- [nio-8480-exec-7] c.a.l.ecomp.policy.std.StdPolicyConfig   : config Retrieved 
+08-Apr-2015 10:31:26.503 WARNING [localhost-startStop-2] org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web application [PyPDPServer] appears to have started a thread named [Grizzly(1) SelectorRunner] but has failed to stop it. This is very likely to create a memory leak. service Catalina08-Apr-2015 10:31:26.503 WARNING [localhost-startStop-2] org.apache.catalina.loader.WebappClassLoaderBase.clearReferencesThreads The web application [PyPDPServer] appears to have started a thread named [Grizzly(1) SelectorRunner] but has failed to stop it. This is very likely to create a memory leak. 
+06-Mar-2015 11:50:06.243 SEVERE [main] org.apache.coyote.AbstractProtocol.init Failed to initialize end point associated with ProtocolHandler ["ajp-nio-8009"] java.net.BindException: Address already in use
+2015_09_30_10_39_31_675 [http-nio-8081-exec-1] ERROR org.openecomp.research.xacml.rest.XACMLPdpServlet.doPost(XACMLPdpServlet.java:644)- PE100 - Permissions Error: PEP not Authorized for making this Request!! 
+2015_03_17_15_01_08_348 [qtp1688376486-32] WARN  org.openecomp.research.xacml.admin.components.PolicyManagement$1.accept(PolicyManagement.java:184)- Filtering out: C:\git\D2PE-take2\policy-engine-prototype\XACML-PAP-ADMIN\workspace\admin\repository\com\.svnignore
\ No newline at end of file
diff --git a/LogParser/src/test/resources/test_config.properties b/LogParser/src/test/resources/test_config.properties
new file mode 100644
index 000000000..6512184c8
--- /dev/null
+++ b/LogParser/src/test/resources/test_config.properties
@@ -0,0 +1,31 @@
+###
+# ============LICENSE_START=======================================================
+# LogParser
+# ================================================================================
+# 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=========================================================
+###
+
+
+RESOURCE_NAME=logparser_pap01
+JDBC_DRIVER=com.mysql.jdbc.Driver
+JDBC_URL=jdbc:mysql://localhost:3306/
+JDBC_USER=root
+JDBC_PASSWORD=password
+jmx_url=service:jmx:rmi:///jndi/rmi://localhost:9996/jmxrmi
+SERVER=https://localhost:9091/pap/
+LOGTYPE=PAP
+LOGPATH=/Workspaces/HealthCheck/pap-rest.log
+PARSERLOGPATH=IntegrityMonitor.log