diff options
Diffstat (limited to 'catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution')
10 files changed, 397 insertions, 598 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactoryTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactoryTest.java index c50ea24fb4..e97fb8e4a8 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactoryTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactoryTest.java @@ -3,18 +3,19 @@ package org.openecomp.sdc.be.auditing.impl.distribution; import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData; public class AuditCreateTopicDistribEngineEventFactoryTest { - private AuditCreateTopicDistribEngineEventFactory createTestSubject() { + private AuditCreateTopicDistributionEngineEventFactory createTestSubject() { Builder newBuilder = CommonAuditData.newBuilder(); CommonAuditData build = newBuilder.build(); - return new AuditCreateTopicDistribEngineEventFactory(build, "", "", "", "", "", ""); + return new AuditCreateTopicDistributionEngineEventFactory(build,DistributionTopicData.newBuilder().build(),"", "", ""); } @Test public void testGetLogMessage() throws Exception { - AuditCreateTopicDistribEngineEventFactory testSubject; + AuditCreateTopicDistributionEngineEventFactory testSubject; String result; // default test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistrEngineFuncTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistrEngineFuncTest.java deleted file mode 100644 index 29285e7aa0..0000000000 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistrEngineFuncTest.java +++ /dev/null @@ -1,191 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.distribution; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DESCRIPTION; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_API_KEY; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_CONSUMER_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_ENV_NAME; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_NOTIFY_TOPIC; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_ROLE; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_STATUS_TOPIC; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DIST_ADD_KEY_ENGINE_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DIST_CREATE_TOPIC_ENGINE_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DIST_REG_ENGINE_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.REQUEST_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.SERVICE_INSTANCE_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.STATUS_OK; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.init; - -import java.util.EnumMap; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.openecomp.sdc.be.auditing.api.AuditEventFactory; -import org.openecomp.sdc.be.auditing.impl.AuditingManager; -import org.openecomp.sdc.be.config.Configuration; -import org.openecomp.sdc.be.dao.api.ActionStatus; -import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao; -import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; -import org.openecomp.sdc.be.dao.impl.AuditingDao; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionEngineEvent; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; -import org.openecomp.sdc.common.util.ThreadLocalsHolder; - -@RunWith(MockitoJUnitRunner.class) -public class AuditDistrEngineFuncTest { - private AuditingManager auditingManager; - - @Mock - private static AuditCassandraDao cassandraDao; - @Mock - private static AuditingDao auditingDao; - @Mock - private static Configuration.ElasticSearchConfig esConfig; - - @Captor - private ArgumentCaptor<AuditingGenericEvent> eventCaptor; - - @Before - public void setUp() { - init(esConfig); - auditingManager = new AuditingManager(auditingDao, cassandraDao); - ThreadLocalsHolder.setUuid(REQUEST_ID); - } - - @Test - public void testNewAddKeyEvent() { - AuditEventFactory factory = new AuditAddKeyDistribEngineEventFactory( - CommonAuditData.newBuilder() - .description(DESCRIPTION) - .status(STATUS_OK) - .requestId(REQUEST_ID) - .serviceInstanceId(SERVICE_INSTANCE_ID) - .build(), - DIST_CONSUMER_ID, DIST_STATUS_TOPIC, DIST_NOTIFY_TOPIC, DIST_API_KEY, DIST_ENV_NAME, DIST_ROLE); - - when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_ADD_KEY_ENGINE_LOG_STR); - verifyEvent(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL.getName()); - } - - @Test - public void testOldAddKeyEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL))).isEqualTo(EXPECTED_DIST_ADD_KEY_ENGINE_LOG_STR); - verifyEvent(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL.getName()); - - } - - @Test - public void testNewCreateTopicEvent() { - AuditEventFactory factory = new AuditCreateTopicDistribEngineEventFactory( - CommonAuditData.newBuilder() - .description(DESCRIPTION) - .status(STATUS_OK) - .requestId(REQUEST_ID) - .serviceInstanceId(SERVICE_INSTANCE_ID) - .build(), - DIST_CONSUMER_ID, DIST_STATUS_TOPIC, DIST_NOTIFY_TOPIC, DIST_API_KEY, DIST_ENV_NAME, DIST_ROLE); - - when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_CREATE_TOPIC_ENGINE_LOG_STR); - verifyEvent(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC.getName()); - } - - @Test - public void testOldCreateTopicEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC))).isEqualTo(EXPECTED_DIST_CREATE_TOPIC_ENGINE_LOG_STR); - verifyEvent(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC.getName()); - } - - @Test - public void testNewRegisterEvent() { - AuditEventFactory factory = new AuditRegisterDistribEngineEventFactory( - CommonAuditData.newBuilder() - .description(DESCRIPTION) - .status(STATUS_OK) - .requestId(REQUEST_ID) - .serviceInstanceId(SERVICE_INSTANCE_ID) - .build(), - DIST_CONSUMER_ID, DIST_STATUS_TOPIC, DIST_NOTIFY_TOPIC, DIST_API_KEY, DIST_ENV_NAME, DIST_ROLE); - - when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_REGISTER.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_REG_ENGINE_LOG_STR); - verifyEvent(AuditingActionEnum.DISTRIBUTION_REGISTER.getName()); - } - - @Test - public void testOldRegisterEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.DISTRIBUTION_REGISTER.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillMap(AuditingActionEnum.DISTRIBUTION_REGISTER))).isEqualTo(EXPECTED_DIST_REG_ENGINE_LOG_STR); - verifyEvent(AuditingActionEnum.DISTRIBUTION_REGISTER.getName()); - } - - private void verifyEvent(String action) { - verify(cassandraDao).saveRecord(eventCaptor.capture()); - DistributionEngineEvent storedEvent = (DistributionEngineEvent) eventCaptor.getValue(); - assertThat(storedEvent.getDnotifTopic()).isEqualTo(DIST_NOTIFY_TOPIC); - assertThat(storedEvent.getDstatusTopic()).isEqualTo(DIST_STATUS_TOPIC); - assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); - assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); - assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); - assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); - assertThat(storedEvent.getAction()).isEqualTo(action); - assertThat(storedEvent.getEnvironmentName()).isEqualTo(DIST_ENV_NAME); - assertThat(storedEvent.getApiKey()).isEqualTo(DIST_API_KEY); - assertThat(storedEvent.getConsumerId()).isEqualTo(DIST_CONSUMER_ID); - assertThat(storedEvent.getRole()).isEqualTo(DIST_ROLE); - } - - private EnumMap<AuditingFieldsKeysEnum, Object> fillMap(AuditingActionEnum action) { - EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, action.getName()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, DIST_CONSUMER_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME, DIST_ENV_NAME); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, STATUS_OK); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, DESCRIPTION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TOPIC_NAME, DIST_STATUS_TOPIC); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_NOTIFICATION_TOPIC_NAME, DIST_NOTIFY_TOPIC); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, DIST_NOTIFY_TOPIC); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY, DIST_API_KEY); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID, REQUEST_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ROLE, DIST_ROLE); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, SERVICE_INSTANCE_ID); - - return auditingFields; - } - - -} diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistrEventFuncTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistrEventFuncTest.java deleted file mode 100644 index ceb25e44b7..0000000000 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistrEventFuncTest.java +++ /dev/null @@ -1,387 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.distribution; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.CURRENT_STATE; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.CURRENT_VERSION; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DESCRIPTION; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_CONSUMER_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_RESOURCE_URL; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.DIST_STATUS_TIME; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DISTRIB_DEPLOY_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DISTRIB_NOTIFICATION_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DIST_DOWNLOAD_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_DIST_STATUS_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.EXPECTED_GET_UEB_CLUSTER_LOG_STR; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.OP_ENV_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.REQUEST_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.RESOURCE_NAME; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.RESOURCE_TYPE; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.SERVICE_INSTANCE_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.STATUS_OK; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.TENANT_CONTEXT; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.TOPIC_NAME; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.USER_FIRST_NAME; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.USER_ID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.USER_LAST_NAME; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.USER_UID; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.VNF_WORKLOAD_CONTEXT; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.init; -import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.user; - -import java.util.EnumMap; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.openecomp.sdc.be.auditing.api.AuditEventFactory; -import org.openecomp.sdc.be.auditing.impl.AuditingManager; -import org.openecomp.sdc.be.config.Configuration; -import org.openecomp.sdc.be.dao.api.ActionStatus; -import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao; -import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; -import org.openecomp.sdc.be.dao.impl.AuditingDao; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; -import org.openecomp.sdc.be.resources.data.auditing.AuditingGetUebClusterEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionDownloadEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent; -import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; -import org.openecomp.sdc.be.resources.data.auditing.model.OperationalEnvAuditData; -import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; -import org.openecomp.sdc.common.util.ThreadLocalsHolder; - -@RunWith(MockitoJUnitRunner.class) -public class AuditDistrEventFuncTest { - - private AuditingManager auditingManager; - - @Mock - private static AuditCassandraDao cassandraDao; - @Mock - private static AuditingDao auditingDao; - @Mock - private static Configuration.ElasticSearchConfig esConfig; - - @Captor - private ArgumentCaptor<AuditingGenericEvent> eventCaptor; - - @Before - public void setUp() { - init(esConfig); - auditingManager = new AuditingManager(auditingDao, cassandraDao); - ThreadLocalsHolder.setUuid(REQUEST_ID); - } - - @Test - public void testNewNotifyEvent() { - AuditEventFactory factory = new AuditDistribNotificationEventFactory( - CommonAuditData.newBuilder() - .description(DESCRIPTION) - .status(STATUS_OK) - .requestId(REQUEST_ID) - .serviceInstanceId(SERVICE_INSTANCE_ID) - .build(), - CURRENT_STATE, CURRENT_VERSION, DIST_ID, user, - RESOURCE_NAME, RESOURCE_TYPE, TOPIC_NAME, - new OperationalEnvAuditData(OP_ENV_ID, VNF_WORKLOAD_CONTEXT, TENANT_CONTEXT)); - - when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_NOTIFY.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DISTRIB_NOTIFICATION_LOG_STR); - verifyNotifyEvent(); - } - - @Test - public void testOldNotifyEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.DISTRIBUTION_NOTIFY.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillNotifyMap())).isEqualTo(EXPECTED_DISTRIB_NOTIFICATION_LOG_STR); - verifyNotifyEvent(); - - } - - @Test - public void testNewStatusEvent() { - AuditEventFactory factory = new AuditDistribStatusEventFactory( - CommonAuditData.newBuilder() - .description(DESCRIPTION) - .status(STATUS_OK) - .requestId(REQUEST_ID) - .serviceInstanceId(SERVICE_INSTANCE_ID) - .build(), - DIST_ID, DIST_CONSUMER_ID, TOPIC_NAME, DIST_RESOURCE_URL, DIST_STATUS_TIME); - - when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_STATUS.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_STATUS_LOG_STR); - verifyStatusEvent(); - } - - @Test - public void testOldStatusEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.DISTRIBUTION_STATUS.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillStatusMap())).isEqualTo(EXPECTED_DIST_STATUS_LOG_STR); - verifyStatusEvent(); - } - - @Test - public void testNewDownloadEvent() { - AuditEventFactory factory = new AuditDistribDownloadEventFactory( - CommonAuditData.newBuilder() - .description(DESCRIPTION) - .status(STATUS_OK) - .requestId(REQUEST_ID) - .serviceInstanceId(SERVICE_INSTANCE_ID) - .build(), - new DistributionData(DIST_CONSUMER_ID, DIST_RESOURCE_URL)); - - when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_ARTIFACT_DOWNLOAD.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_DOWNLOAD_LOG_STR); - verifyDownloadsEvent(); - } - - @Test - public void testOldDownloadEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.DISTRIBUTION_ARTIFACT_DOWNLOAD.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillDownloadMap())).isEqualTo(EXPECTED_DIST_DOWNLOAD_LOG_STR); - verifyDownloadsEvent(); - } - - @Test - public void testNewDeployEvent() { - AuditEventFactory factory = new AuditDistribDeployEventFactory( - CommonAuditData.newBuilder() - .description(DESCRIPTION) - .status(STATUS_OK) - .requestId(REQUEST_ID) - .serviceInstanceId(SERVICE_INSTANCE_ID) - .build(), - CURRENT_VERSION, - DIST_ID, user, RESOURCE_NAME, RESOURCE_TYPE); - - when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_DEPLOY.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DISTRIB_DEPLOY_LOG_STR); - verifyDeployEvent(); - } - - @Test - public void testOldDeployEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.DISTRIBUTION_DEPLOY.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillDeployMap())).isEqualTo(EXPECTED_DISTRIB_DEPLOY_LOG_STR); - verifyDeployEvent(); - } - - @Test - public void testNewGetUebClusterEvent() { - AuditEventFactory factory = new AuditGetUebClusterEventFactory( - CommonAuditData.newBuilder() - .description(DESCRIPTION) - .status(STATUS_OK) - .requestId(REQUEST_ID) - .serviceInstanceId(SERVICE_INSTANCE_ID) - .build(), - DIST_CONSUMER_ID); - - when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.GET_UEB_CLUSTER.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_GET_UEB_CLUSTER_LOG_STR); - verifyGetUebClusterEvent(); - } - - @Test - public void testOldGetUebClusterEvent() { - when(auditingDao.addRecord(anyMap(), eq(AuditingActionEnum.GET_UEB_CLUSTER.getAuditingEsType()))) - .thenReturn(ActionStatus.OK); - when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); - - assertThat(auditingManager.auditEvent(fillGetUebClusterMap())).isEqualTo(EXPECTED_GET_UEB_CLUSTER_LOG_STR); - verifyGetUebClusterEvent(); - } - - private void verifyNotifyEvent() { - verify(cassandraDao).saveRecord(eventCaptor.capture()); - DistributionNotificationEvent storedEvent = (DistributionNotificationEvent) eventCaptor.getValue(); - assertThat(storedEvent.getCurrState()).isEqualTo(CURRENT_STATE); - assertThat(storedEvent.getCurrVersion()).isEqualTo(CURRENT_VERSION); - assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); - assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); - assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); - assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); - assertThat(storedEvent.getAction()).isEqualTo(AuditingActionEnum.DISTRIBUTION_NOTIFY.getName()); - assertThat(storedEvent.getDid()).isEqualTo(DIST_ID); - assertThat(storedEvent.getModifier()).isEqualTo(USER_UID); - assertThat(storedEvent.getResourceName()).isEqualTo(RESOURCE_NAME); - assertThat(storedEvent.getResourceType()).isEqualTo(RESOURCE_TYPE); - assertThat(storedEvent.getTopicName()).isEqualTo(TOPIC_NAME); - assertThat(storedEvent.getVnfWorkloadContext()).isEqualTo(VNF_WORKLOAD_CONTEXT); - assertThat(storedEvent.getEnvId()).isEqualTo(OP_ENV_ID); - assertThat(storedEvent.getTenant()).isEqualTo(TENANT_CONTEXT); - } - - private void verifyStatusEvent() { - verify(cassandraDao).saveRecord(eventCaptor.capture()); - DistributionStatusEvent storedEvent = (DistributionStatusEvent) eventCaptor.getValue(); - assertThat(storedEvent.getConsumerId()).isEqualTo(DIST_CONSUMER_ID); - assertThat(storedEvent.getDid()).isEqualTo(DIST_ID); - assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); - assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); - assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); - assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); - assertThat(storedEvent.getAction()).isEqualTo(AuditingActionEnum.DISTRIBUTION_STATUS.getName()); - assertThat(storedEvent.getStatusTime()).isEqualTo(DIST_STATUS_TIME); - assertThat(storedEvent.getResoureURL()).isEqualTo(DIST_RESOURCE_URL); - assertThat(storedEvent.getTopicName()).isEqualTo(TOPIC_NAME); - } - - private void verifyDownloadsEvent() { - verify(cassandraDao).saveRecord(eventCaptor.capture()); - DistributionDownloadEvent storedEvent = (DistributionDownloadEvent) eventCaptor.getValue(); - assertThat(storedEvent.getConsumerId()).isEqualTo(DIST_CONSUMER_ID); - assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); - assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); - assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); - assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); - assertThat(storedEvent.getResourceUrl()).isEqualTo(DIST_RESOURCE_URL); - } - - private void verifyDeployEvent() { - verify(cassandraDao).saveRecord(eventCaptor.capture()); - DistributionDeployEvent storedEvent = (DistributionDeployEvent) eventCaptor.getValue(); - assertThat(storedEvent.getCurrVersion()).isEqualTo(CURRENT_VERSION); - assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); - assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); - assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); - assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); - assertThat(storedEvent.getDid()).isEqualTo(DIST_ID); - assertThat(storedEvent.getModifier()).isEqualTo(USER_UID); - assertThat(storedEvent.getResourceName()).isEqualTo(RESOURCE_NAME); - assertThat(storedEvent.getResourceType()).isEqualTo(RESOURCE_TYPE); - } - - private void verifyGetUebClusterEvent() { - verify(cassandraDao).saveRecord(eventCaptor.capture()); - AuditingGetUebClusterEvent storedEvent = (AuditingGetUebClusterEvent) eventCaptor.getValue(); - assertThat(storedEvent.getConsumerId()).isEqualTo(DIST_CONSUMER_ID); - assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); - assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); - assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); - assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); - } - - private EnumMap<AuditingFieldsKeysEnum, Object> fillNotifyMap() { - EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, AuditingActionEnum.DISTRIBUTION_NOTIFY.getName()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, STATUS_OK); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, DESCRIPTION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, DIST_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, RESOURCE_TYPE); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, SERVICE_INSTANCE_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, RESOURCE_NAME); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, CURRENT_STATE); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, CURRENT_VERSION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, USER_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, USER_FIRST_NAME + " " + USER_LAST_NAME); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, TOPIC_NAME); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_VNF_WORKLOAD_CONTEXT, VNF_WORKLOAD_CONTEXT); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TENANT, TENANT_CONTEXT); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVIRONMENT_ID, OP_ENV_ID); - - return auditingFields; - } - - private EnumMap<AuditingFieldsKeysEnum, Object> fillStatusMap() { - EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, AuditingActionEnum.DISTRIBUTION_STATUS.getName()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, TOPIC_NAME); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, STATUS_OK); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, DESCRIPTION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, DIST_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, SERVICE_INSTANCE_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, DIST_RESOURCE_URL); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME, DIST_STATUS_TIME); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, DIST_CONSUMER_ID); - - return auditingFields; - } - - private EnumMap<AuditingFieldsKeysEnum, Object> fillDownloadMap() { - EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, AuditingActionEnum.DISTRIBUTION_ARTIFACT_DOWNLOAD.getName()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, DIST_CONSUMER_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, STATUS_OK); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, DESCRIPTION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID, REQUEST_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, DIST_RESOURCE_URL); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, SERVICE_INSTANCE_ID); - - return auditingFields; - } - - private EnumMap<AuditingFieldsKeysEnum, Object> fillDeployMap() { - EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, AuditingActionEnum.DISTRIBUTION_DEPLOY.getName()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, STATUS_OK); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, DESCRIPTION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, DIST_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, RESOURCE_TYPE); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, SERVICE_INSTANCE_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, RESOURCE_NAME); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, CURRENT_VERSION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, USER_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, USER_FIRST_NAME + " " + USER_LAST_NAME); - - return auditingFields; - } - - private EnumMap<AuditingFieldsKeysEnum, Object> fillGetUebClusterMap() { - EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, AuditingActionEnum.GET_UEB_CLUSTER.getName()); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, DIST_CONSUMER_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, STATUS_OK); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC, DESCRIPTION); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID, REQUEST_ID); - auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, SERVICE_INSTANCE_ID); - - return auditingFields; - } - - - - -} diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactoryTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactoryTest.java index 6a314da699..9aa8c5dbbe 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactoryTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactoryTest.java @@ -5,18 +5,19 @@ import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; public class AuditDistribDeployEventFactoryTest { - private AuditDistribDeployEventFactory createTestSubject() { + private AuditDistributionDeployEventFactory createTestSubject() { Builder newBuilder = CommonAuditData.newBuilder(); CommonAuditData build = newBuilder.build(); - return new AuditDistribDeployEventFactory(build, "", "", new User(), "", ""); + return new AuditDistributionDeployEventFactory(build,new ResourceCommonInfo(),"", new User(), "1.0"); } @Test public void testGetLogMessage() throws Exception { - AuditDistribDeployEventFactory testSubject; + AuditDistributionDeployEventFactory testSubject; String result; // default test @@ -26,7 +27,7 @@ public class AuditDistribDeployEventFactoryTest { @Test public void testGetDbEvent() throws Exception { - AuditDistribDeployEventFactory testSubject; + AuditDistributionDeployEventFactory testSubject; AuditingGenericEvent result; // default test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDownloadEventFactoryTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDownloadEventFactoryTest.java index 3aaeb6fddd..5027940d1b 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDownloadEventFactoryTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDownloadEventFactoryTest.java @@ -1,22 +1,23 @@ package org.openecomp.sdc.be.auditing.impl.distribution; import org.junit.Test; +import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; -import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; public class AuditDistribDownloadEventFactoryTest { - private AuditDistribDownloadEventFactory createTestSubject() { + private AuditDistributionDeployEventFactory createTestSubject() { Builder newBuilder = CommonAuditData.newBuilder(); CommonAuditData build = newBuilder.build(); - return new AuditDistribDownloadEventFactory(build, new DistributionData("", "")); + return new AuditDistributionDeployEventFactory(build,new ResourceCommonInfo(),"",new User(),"1.0"); } @Test public void testGetLogMessage() throws Exception { - AuditDistribDownloadEventFactory testSubject; + AuditDistributionDeployEventFactory testSubject; String result; // default test @@ -26,7 +27,7 @@ public class AuditDistribDownloadEventFactoryTest { @Test public void testGetDbEvent() throws Exception { - AuditDistribDownloadEventFactory testSubject; + AuditDistributionDeployEventFactory testSubject; AuditingGenericEvent result; // default test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactoryTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactoryTest.java index 06b45a4736..5dd351ff7d 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactoryTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactoryTest.java @@ -6,19 +6,21 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; import org.openecomp.sdc.be.resources.data.auditing.model.OperationalEnvAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; public class AuditDistribNotificationEventFactoryTest { - private AuditDistribNotificationEventFactory createTestSubject() { + private AuditDistributionNotificationEventFactory createTestSubject() { Builder newBuilder = CommonAuditData.newBuilder(); CommonAuditData build = newBuilder.build(); - return new AuditDistribNotificationEventFactory(build, "", "", "", new User(), "", "", "", + return new AuditDistributionNotificationEventFactory(build,new ResourceCommonInfo(), ResourceVersionInfo.newBuilder().build(), "",new User(),"", new OperationalEnvAuditData("", "", "")); } @Test public void testGetLogMessage() throws Exception { - AuditDistribNotificationEventFactory testSubject; + AuditDistributionNotificationEventFactory testSubject; String result; // default test @@ -28,7 +30,7 @@ public class AuditDistribNotificationEventFactoryTest { @Test public void testGetDbEvent() throws Exception { - AuditDistribNotificationEventFactory testSubject; + AuditDistributionNotificationEventFactory testSubject; AuditingGenericEvent result; // default test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactoryTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactoryTest.java index a9b5e68394..3f6ec5dbd2 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactoryTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactoryTest.java @@ -4,18 +4,19 @@ import org.junit.Test; import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; public class AuditDistribStatusEventFactoryTest { - private AuditDistribStatusEventFactory createTestSubject() { + private AuditDistributionStatusEventFactory createTestSubject() { Builder newBuilder = CommonAuditData.newBuilder(); CommonAuditData build = newBuilder.build(); - return new AuditDistribStatusEventFactory(build, "", "", "", "", ""); + return new AuditDistributionStatusEventFactory(build,new DistributionData("",""), "", "", ""); } @Test public void testGetLogMessage() throws Exception { - AuditDistribStatusEventFactory testSubject; + AuditDistributionStatusEventFactory testSubject; String result; // default test @@ -25,7 +26,7 @@ public class AuditDistribStatusEventFactoryTest { @Test public void testGetDbEvent() throws Exception { - AuditDistribStatusEventFactory testSubject; + AuditDistributionStatusEventFactory testSubject; AuditingGenericEvent result; // default test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineFuncTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineFuncTest.java new file mode 100644 index 0000000000..25cf1fbf11 --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineFuncTest.java @@ -0,0 +1,146 @@ +package org.openecomp.sdc.be.auditing.impl.distribution; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.openecomp.sdc.be.auditing.api.AuditEventFactory; +import org.openecomp.sdc.be.auditing.impl.AuditingManager; +import org.openecomp.sdc.be.config.Configuration; +import org.openecomp.sdc.be.dao.api.ActionStatus; +import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao; +import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; +import org.openecomp.sdc.be.dao.impl.AuditingDao; +import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; +import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; +import org.openecomp.sdc.be.resources.data.auditing.DistributionEngineEvent; +import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData; +import org.openecomp.sdc.common.util.ThreadLocalsHolder; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.*; + +@RunWith(MockitoJUnitRunner.class) +public class AuditDistributionEngineFuncTest { + private AuditingManager auditingManager; + + @Mock + private static AuditCassandraDao cassandraDao; + @Mock + private static AuditingDao auditingDao; + @Mock + private static Configuration.ElasticSearchConfig esConfig; + + @Captor + private ArgumentCaptor<DistributionEngineEvent> eventCaptor; + + @Before + public void setUp() { + init(esConfig); + auditingManager = new AuditingManager(auditingDao, cassandraDao); + ThreadLocalsHolder.setUuid(REQUEST_ID); + } + + @Test + public void testAddKeyEvent() { + AuditEventFactory factory = new AuditAddRemoveKeyDistributionEngineEventFactory( + AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL, + CommonAuditData.newBuilder() + .description(DESCRIPTION) + .status(STATUS_OK) + .requestId(REQUEST_ID) + .serviceInstanceId(SERVICE_INSTANCE_ID) + .build(), + DistributionTopicData.newBuilder() + .statusTopic(DIST_STATUS_TOPIC) + .notificationTopic(DIST_NOTIFY_TOPIC) + .build(), + DIST_API_KEY, DIST_ENV_NAME, DIST_ROLE); + + when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL.getAuditingEsType()))) + .thenReturn(ActionStatus.OK); + when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); + + assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_ADD_KEY_ENGINE_LOG_STR); + verifyEvent(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL.getName()); + } + + @Test + public void testCreateTopicEvent() { + AuditEventFactory factory = new AuditCreateTopicDistributionEngineEventFactory( + CommonAuditData.newBuilder() + .description(DESCRIPTION) + .status(STATUS_OK) + .requestId(REQUEST_ID) + .serviceInstanceId(SERVICE_INSTANCE_ID) + .build(), + DistributionTopicData.newBuilder() + .statusTopic(DIST_STATUS_TOPIC) + .notificationTopic(DIST_NOTIFY_TOPIC) + .build(), + DIST_API_KEY, DIST_ENV_NAME, DIST_ROLE); + + when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC.getAuditingEsType()))) + .thenReturn(ActionStatus.OK); + when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); + + assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_CREATE_TOPIC_ENGINE_LOG_STR); + verifyEvent(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC.getName()); + } + + @Test + public void testRegisterEvent() { + AuditEventFactory factory = new AuditRegUnregDistributionEngineEventFactory( + AuditingActionEnum.DISTRIBUTION_REGISTER, + CommonAuditData.newBuilder() + .description(DESCRIPTION) + .status(STATUS_OK) + .requestId(REQUEST_ID) + .serviceInstanceId(SERVICE_INSTANCE_ID) + .build(), + DistributionTopicData.newBuilder() + .statusTopic(DIST_STATUS_TOPIC) + .notificationTopic(DIST_NOTIFY_TOPIC) + .build(), + DIST_CONSUMER_ID, DIST_API_KEY, DIST_ENV_NAME); + + when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_REGISTER.getAuditingEsType()))) + .thenReturn(ActionStatus.OK); + when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); + + assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_REG_ENGINE_LOG_STR); + verifyEvent(AuditingActionEnum.DISTRIBUTION_REGISTER.getName()); + } + + private void verifyEvent(String action) { + verify(cassandraDao).saveRecord(eventCaptor.capture()); + DistributionEngineEvent storedEvent = eventCaptor.getValue(); + assertThat(storedEvent.getDnotifTopic()).isEqualTo(DIST_NOTIFY_TOPIC); + assertThat(storedEvent.getDstatusTopic()).isEqualTo(DIST_STATUS_TOPIC); + assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); + assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); + assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); + assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); + assertThat(storedEvent.getAction()).isEqualTo(action); + assertThat(storedEvent.getEnvironmentName()).isEqualTo(DIST_ENV_NAME); + assertThat(storedEvent.getApiKey()).isEqualTo(DIST_API_KEY); + if (!action.equals(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC.getName()) && + !action.equals(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL.getName()) && + !action.equals(AuditingActionEnum.REMOVE_KEY_FROM_TOPIC_ACL.getName())) { + assertThat(storedEvent.getConsumerId()).isEqualTo(DIST_CONSUMER_ID); + } + if (!action.equals(AuditingActionEnum.DISTRIBUTION_REGISTER.getName()) && + !action.equals(AuditingActionEnum.DISTRIBUTION_UN_REGISTER.getName())) { + assertThat(storedEvent.getRole()).isEqualTo(DIST_ROLE); + } + } + +} diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEventFuncTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEventFuncTest.java new file mode 100644 index 0000000000..4c9c63343f --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEventFuncTest.java @@ -0,0 +1,224 @@ +package org.openecomp.sdc.be.auditing.impl.distribution; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.openecomp.sdc.be.auditing.api.AuditEventFactory; +import org.openecomp.sdc.be.auditing.impl.AuditGetUebClusterEventFactory; +import org.openecomp.sdc.be.auditing.impl.AuditingManager; +import org.openecomp.sdc.be.config.Configuration; +import org.openecomp.sdc.be.dao.api.ActionStatus; +import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao; +import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; +import org.openecomp.sdc.be.dao.impl.AuditingDao; +import org.openecomp.sdc.be.resources.data.auditing.*; +import org.openecomp.sdc.be.resources.data.auditing.model.*; +import org.openecomp.sdc.common.util.ThreadLocalsHolder; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.openecomp.sdc.be.auditing.impl.AuditTestUtils.*; + +@RunWith(MockitoJUnitRunner.class) +public class AuditDistributionEventFuncTest { + + private AuditingManager auditingManager; + + @Mock + private static AuditCassandraDao cassandraDao; + @Mock + private static AuditingDao auditingDao; + @Mock + private static Configuration.ElasticSearchConfig esConfig; + + @Captor + private ArgumentCaptor<AuditingGenericEvent> eventCaptor; + + @Before + public void setUp() { + init(esConfig); + auditingManager = new AuditingManager(auditingDao, cassandraDao); + ThreadLocalsHolder.setUuid(REQUEST_ID); + } + + @Test + public void testNotifyEvent() { + AuditEventFactory factory = new AuditDistributionNotificationEventFactory( + CommonAuditData.newBuilder() + .description(DESCRIPTION) + .status(STATUS_OK) + .requestId(REQUEST_ID) + .serviceInstanceId(SERVICE_INSTANCE_ID) + .build(), + new ResourceCommonInfo(RESOURCE_NAME,RESOURCE_TYPE), + ResourceVersionInfo.newBuilder() + .state(CURRENT_STATE) + .version(CURRENT_VERSION) + .build(), + DIST_ID, user, TOPIC_NAME, + new OperationalEnvAuditData(OP_ENV_ID, VNF_WORKLOAD_CONTEXT, TENANT_CONTEXT)); + + when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_NOTIFY.getAuditingEsType()))) + .thenReturn(ActionStatus.OK); + when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); + + assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DISTRIB_NOTIFICATION_LOG_STR); + verifyNotifyEvent(); + } + + @Test + public void testStatusEvent() { + AuditEventFactory factory = new AuditDistributionStatusEventFactory( + CommonAuditData.newBuilder() + .description(DESCRIPTION) + .status(STATUS_OK) + .requestId(REQUEST_ID) + .serviceInstanceId(SERVICE_INSTANCE_ID) + .build(), + new DistributionData(DIST_CONSUMER_ID, DIST_RESOURCE_URL), + DIST_ID, TOPIC_NAME, DIST_STATUS_TIME); + + when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_STATUS.getAuditingEsType()))) + .thenReturn(ActionStatus.OK); + when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); + + assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_STATUS_LOG_STR); + verifyStatusEvent(); + } + + @Test + public void testDownloadEvent() { + AuditEventFactory factory = new AuditDistributionDownloadEventFactory( + CommonAuditData.newBuilder() + .description(DESCRIPTION) + .status(STATUS_OK) + .requestId(REQUEST_ID) + .serviceInstanceId(SERVICE_INSTANCE_ID) + .build(), + new DistributionData(DIST_CONSUMER_ID, DIST_RESOURCE_URL)); + + when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_ARTIFACT_DOWNLOAD.getAuditingEsType()))) + .thenReturn(ActionStatus.OK); + when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); + + assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DIST_DOWNLOAD_LOG_STR); + verifyDownloadsEvent(); + } + + @Test + public void testDeployEvent() { + AuditEventFactory factory = new AuditDistributionDeployEventFactory( + CommonAuditData.newBuilder() + .description(DESCRIPTION) + .status(STATUS_OK) + .requestId(REQUEST_ID) + .serviceInstanceId(SERVICE_INSTANCE_ID) + .build(), + new ResourceCommonInfo(RESOURCE_NAME,RESOURCE_TYPE), + DIST_ID, user, CURRENT_VERSION); + + when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.DISTRIBUTION_DEPLOY.getAuditingEsType()))) + .thenReturn(ActionStatus.OK); + when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); + + assertThat(auditingManager.auditEvent(factory)).isEqualTo(EXPECTED_DISTRIB_DEPLOY_LOG_STR); + verifyDeployEvent(); + } + + @Test + public void testGetUebClusterEvent() { + AuditEventFactory factory = new AuditGetUebClusterEventFactory( + CommonAuditData.newBuilder() + .description(DESCRIPTION) + .status(STATUS_OK) + .requestId(REQUEST_ID) + .serviceInstanceId(SERVICE_INSTANCE_ID) + .build(), + DIST_CONSUMER_ID); + + when(auditingDao.addRecord(any(AuditingGenericEvent.class), eq(AuditingActionEnum.GET_UEB_CLUSTER.getAuditingEsType()))) + .thenReturn(ActionStatus.OK); + when(cassandraDao.saveRecord(any(AuditingGenericEvent.class))).thenReturn(CassandraOperationStatus.OK); + + assertThat(auditingManager.auditEvent(factory)).contains(EXPECTED_GET_UEB_CLUSTER_LOG_STR); + verifyGetUebClusterEvent(); + } + + private void verifyNotifyEvent() { + verify(cassandraDao).saveRecord(eventCaptor.capture()); + DistributionNotificationEvent storedEvent = (DistributionNotificationEvent) eventCaptor.getValue(); + assertThat(storedEvent.getCurrState()).isEqualTo(CURRENT_STATE); + assertThat(storedEvent.getCurrVersion()).isEqualTo(CURRENT_VERSION); + assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); + assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); + assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); + assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); + assertThat(storedEvent.getAction()).isEqualTo(AuditingActionEnum.DISTRIBUTION_NOTIFY.getName()); + assertThat(storedEvent.getDid()).isEqualTo(DIST_ID); + assertThat(storedEvent.getModifier()).isEqualTo(USER_UID); + assertThat(storedEvent.getResourceName()).isEqualTo(RESOURCE_NAME); + assertThat(storedEvent.getResourceType()).isEqualTo(RESOURCE_TYPE); + assertThat(storedEvent.getTopicName()).isEqualTo(TOPIC_NAME); + assertThat(storedEvent.getVnfWorkloadContext()).isEqualTo(VNF_WORKLOAD_CONTEXT); + assertThat(storedEvent.getEnvId()).isEqualTo(OP_ENV_ID); + assertThat(storedEvent.getTenant()).isEqualTo(TENANT_CONTEXT); + } + + private void verifyStatusEvent() { + verify(cassandraDao).saveRecord(eventCaptor.capture()); + DistributionStatusEvent storedEvent = (DistributionStatusEvent) eventCaptor.getValue(); + assertThat(storedEvent.getConsumerId()).isEqualTo(DIST_CONSUMER_ID); + assertThat(storedEvent.getDid()).isEqualTo(DIST_ID); + assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); + assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); + assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); + assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); + assertThat(storedEvent.getAction()).isEqualTo(AuditingActionEnum.DISTRIBUTION_STATUS.getName()); + assertThat(storedEvent.getStatusTime()).isEqualTo(DIST_STATUS_TIME); + assertThat(storedEvent.getResoureURL()).isEqualTo(DIST_RESOURCE_URL); + assertThat(storedEvent.getTopicName()).isEqualTo(TOPIC_NAME); + } + + private void verifyDownloadsEvent() { + verify(cassandraDao).saveRecord(eventCaptor.capture()); + DistributionDownloadEvent storedEvent = (DistributionDownloadEvent) eventCaptor.getValue(); + assertThat(storedEvent.getConsumerId()).isEqualTo(DIST_CONSUMER_ID); + assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); + assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); + assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); + assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); + assertThat(storedEvent.getResourceUrl()).isEqualTo(DIST_RESOURCE_URL); + } + + private void verifyDeployEvent() { + verify(cassandraDao).saveRecord(eventCaptor.capture()); + DistributionDeployEvent storedEvent = (DistributionDeployEvent) eventCaptor.getValue(); + assertThat(storedEvent.getCurrVersion()).isEqualTo(CURRENT_VERSION); + assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); + assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); + assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); + assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); + assertThat(storedEvent.getDid()).isEqualTo(DIST_ID); + assertThat(storedEvent.getModifier()).isEqualTo(USER_UID); + assertThat(storedEvent.getResourceName()).isEqualTo(RESOURCE_NAME); + assertThat(storedEvent.getResourceType()).isEqualTo(RESOURCE_TYPE); + } + + private void verifyGetUebClusterEvent() { + verify(cassandraDao).saveRecord(eventCaptor.capture()); + AuditingGetUebClusterEvent storedEvent = (AuditingGetUebClusterEvent) eventCaptor.getValue(); + assertThat(storedEvent.getConsumerId()).isEqualTo(DIST_CONSUMER_ID); + assertThat(storedEvent.getDesc()).isEqualTo(DESCRIPTION); + assertThat(storedEvent.getStatus()).isEqualTo(STATUS_OK); + assertThat(storedEvent.getRequestId()).isEqualTo(REQUEST_ID); + assertThat(storedEvent.getServiceInstanceId()).isEqualTo(SERVICE_INSTANCE_ID); + } + +} diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactoryTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactoryTest.java index 10608ab651..ee8100ef6a 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactoryTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactoryTest.java @@ -1,6 +1,7 @@ package org.openecomp.sdc.be.auditing.impl.distribution; import org.junit.Test; +import org.openecomp.sdc.be.auditing.impl.AuditGetUebClusterEventFactory; import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData.Builder; |