Filter FM and PM events & change targetType to PNF

Issue-ID: DCAEGEN2-2200
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: Ib6479b5be8dfc0ce7f42395b5d048ada5d674ff3

3 files changed, 98 insertions, 29 deletions

diff --git a/src/test/java/org/onap/dcaegen2/services/sonhms/DmaapNotificationsComponentTest.java b/src/test/java/org/onap/dcaegen2/services/sonhms/DmaapNotificationsComponentTest.java
index 4b36b32..4a3fb42 100644
--- a/src/test/java/org/onap/dcaegen2/services/sonhms/DmaapNotificationsComponentTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/sonhms/DmaapNotificationsComponentTest.java
@@ -2,7 +2,7 @@
  *  ============LICENSE_START=======================================================
  *  son-handler
  *  ================================================================================
- *   Copyright (C) 2019 Wipro Limited.
+ *   Copyright (C) 2019-2020 Wipro Limited.
  *   ==============================================================================
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.onap.dcaegen2.services.sonhms.dao.DmaapNotificationsRepository;
 import org.onap.dcaegen2.services.sonhms.dao.PerformanceNotificationsRepository;
 import org.onap.dcaegen2.services.sonhms.model.Notification;
@@ -51,29 +52,33 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(SpringRunner.class)
-@PrepareForTest({ BeanUtil.class })
+@PrepareForTest({ BeanUtil.class, Configuration.class })
 @SpringBootTest(classes = DmaapNotificationsComponentTest.class)
 
 public class DmaapNotificationsComponentTest {
 
 	@Mock
 	DmaapNotificationsRepository dmaapNotificationsRepositoryMock;
-	
+
 	@Mock
 	PerformanceNotificationsRepository performanceNotificationsRepositoryMock;
 
+	@Mock
+	Configuration configurationMock;
+
 	@InjectMocks
 	DmaapNotificationsComponent component;
 
 	static String notificationString;
 	static String pmNotificationString;
-
+	static String pmNotificationString2;
 
 	@BeforeClass
 	public static void setupTest() {
 
 		notificationString = readFromFile("/notification1.json");
-		pmNotificationString=readFromFile("/pmNotification.json");
+		pmNotificationString = readFromFile("/pmNotification.json");
+		pmNotificationString2 = readFromFile("/pmNotification2.json");
 
 	}
 
@@ -84,38 +89,56 @@ public class DmaapNotificationsComponentTest {
 				.thenReturn(dmaapNotificationsRepositoryMock);
 		when(dmaapNotificationsRepositoryMock.getNotificationFromQueue()).thenReturn(notificationString);
 
-
 		Either<Notification, Integer> result = component.getSdnrNotifications();
-		//assertTrue(result.isLeft());
+		// assertTrue(result.isLeft());
 		assertNotNull(result.left().value());
-		
+
 		when(dmaapNotificationsRepositoryMock.getNotificationFromQueue()).thenReturn("notification");
 
-        result = component.getSdnrNotifications();
-        int resultRight = result.right().value();
-        assertEquals(400, resultRight);
-		
+		result = component.getSdnrNotifications();
+		int resultRight = result.right().value();
+		assertEquals(400, resultRight);
+
 	}
-	
+
 	@Test
 	public void getPmNotificationsTest() {
-	    PowerMockito.mockStatic(BeanUtil.class);
-        PowerMockito.when(BeanUtil.getBean(PerformanceNotificationsRepository.class))
-                .thenReturn(performanceNotificationsRepositoryMock);
-        when(performanceNotificationsRepositoryMock.getPerformanceNotificationFromQueue()).thenReturn(pmNotificationString);
-        
-        Either<PmNotification,Integer> result = component.getPmNotifications();
-        assertTrue(result.isLeft());
-        assertNotNull(result.left().value());
-        
-        when(performanceNotificationsRepositoryMock.getPerformanceNotificationFromQueue()).thenReturn("pmNotification");
-        result = component.getPmNotifications();
-        int res= result.right().value();
-        assertEquals(400,res);
-        
+		PowerMockito.mockStatic(BeanUtil.class);
+		PowerMockito.when(BeanUtil.getBean(PerformanceNotificationsRepository.class))
+				.thenReturn(performanceNotificationsRepositoryMock);
+		when(performanceNotificationsRepositoryMock.getPerformanceNotificationFromQueue())
+				.thenReturn(pmNotificationString);
+		PowerMockito.mockStatic(Configuration.class);
+		PowerMockito.when(Configuration.getInstance()).thenReturn(configurationMock);
+		when(configurationMock.getNfNamingCode()).thenReturn("RansimAgent");
+		Either<PmNotification, Integer> result = component.getPmNotifications();
+		assertTrue(result.isLeft());
+		assertNotNull(result.left().value());
+		when(performanceNotificationsRepositoryMock.getPerformanceNotificationFromQueue()).thenReturn("pmNotification");
+		result = component.getPmNotifications();
+		int res = result.right().value();
+		assertEquals(400, res);
+
+	}
+
+	@Test
+	public void getPmNotificationsORanNotifTest() {
+		PowerMockito.mockStatic(BeanUtil.class);
+		PowerMockito.when(BeanUtil.getBean(PerformanceNotificationsRepository.class))
+				.thenReturn(performanceNotificationsRepositoryMock);
+		PowerMockito.mockStatic(Configuration.class);
+		PowerMockito.when(Configuration.getInstance()).thenReturn(configurationMock);
+		when(configurationMock.getNfNamingCode()).thenReturn("RansimAgent");
+		when(performanceNotificationsRepositoryMock.getPerformanceNotificationFromQueue())
+				.thenReturn(pmNotificationString2);
+		Either<PmNotification, Integer> result = component.getPmNotifications();
+		result = component.getPmNotifications();
+		int res = result.right().value();
+		assertEquals(404, res);
+
 	}
 
-	private static String readFromFile(String file) { 
+	private static String readFromFile(String file) {
 		String content = new String();
 		try {
 
@@ -135,3 +158,4 @@ public class DmaapNotificationsComponentTest {
 	}
 
 }
+
diff --git a/src/test/resources/pmNotification2.json b/src/test/resources/pmNotification2.json
new file mode 100644
index 0000000..b55f489
--- /dev/null
+++ b/src/test/resources/pmNotification2.json
@@ -0,0 +1,45 @@
+ 
+ {
+   "event":{
+      "commonEventHeader":{
+         "version":"4.0.1",
+         "domain":"measurement",
+         "eventName":"Measurement_RansimAgent-Wipro_HandoffMetric",
+         "eventId":"measurement000001",
+         "sequence":0,
+         "priority":"Normal",
+         "reportingEntityId":"cc305d54-75b4-431b-adb2-eb6b9e541234",
+         "reportingEntityName":"ncserver1",
+         "sourceId":"de305d54-75b4-431b-adb2-eb6b9e546456",
+         "sourceName":"Chn0002",
+         "startEpochMicrosec":1551772223000000,
+         "lastEpochMicrosec":1551790542000000,
+         "nfNamingCode":"SDN",
+         "nfVendorName":"Wipro",
+         "vesEventListenerVersion":"7.0.1",
+         "timeZoneOffset":"UTC-05:30"
+      },
+      "measurementFields":{
+         "measurementInterval":180,
+         "measurementFieldsVersion":"4.0",
+         "additionalMeasurements":[
+            {
+               "hashMap":{
+                  "networkId":"plmnid1",
+                  "InterEnbOutAtt_X2HO":"300",
+                  "InterEnbOutSucc_X2HO":"100"
+               },
+               "name":"Chn0004"
+            },
+            {
+               "hashMap":{
+		  "networkId":"plmnid1",
+                  "InterEnbOutAtt_X2HO":"250",
+                  "InterEnbOutSucc_X2HO":"100"
+               },
+               "name":"Chn0001"
+            }
+         ]
+      }
+   }
+}
diff --git a/src/test/resources/policy_notification.json b/src/test/resources/policy_notification.json
index 35fe06c..767c024 100644
--- a/src/test/resources/policy_notification.json
+++ b/src/test/resources/policy_notification.json
@@ -3,7 +3,7 @@
 	"closedLoopAlarmStart": 1542445563201,
 	"closedLoopEventClient": "microservice.PCI",
 	"closedLoopEventStatus": "ONSET",
-	"target_type": "VNF",
+	"target_type": "PNF",
 	"target": "generic-vnf.vnf-id",
 	"requestID": "a4130fd5-2291-4a83-8992-04e4c9f32731",
 	"from": "PCIMS",