From f47919f1fe367b612fa9c96d34c59f01a541e882 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Mon, 8 Apr 2019 14:14:34 -0400 Subject: Replaced all tabs with spaces in java and pom.xml Added in maven plugins to enforce coding style rules Added in eclipse java formatting xml Change-Id: I3727bbf4ce8dc66abfd8ad21b6cfd0890c5d3ff0 Issue-ID: SO-1765 Signed-off-by: Benjamin, Max (mb388a) --- .../RequestProcessingDataRequestDbQueryTest.java | 93 ++- .../so/adapters/requestsdb/AllTestsTestSuite.java | 6 +- .../ArchiveInfraRequestsSchedulerTest.java | 82 +- ...tiveRequestsRepositoryCustomControllerTest.java | 113 ++- .../adapters/HealthCheckHandlerTest.java | 73 +- .../requestsdb/adapters/MSORequestDBImplTest.java | 829 ++++++++++----------- .../application/EmbeddedMariaDbConfig.java | 66 +- .../requestsdb/application/TestAppender.java | 12 +- .../client/RequestDbClientPortChanger.java | 1 + .../requestsdb/client/RequestsDbClientTest.java | 98 +-- 10 files changed, 654 insertions(+), 719 deletions(-) (limited to 'adapters/mso-requests-db-adapter/src/test') diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestdb/rest/RequestProcessingDataRequestDbQueryTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestdb/rest/RequestProcessingDataRequestDbQueryTest.java index 34643a428d..abc70ed6bf 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestdb/rest/RequestProcessingDataRequestDbQueryTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestdb/rest/RequestProcessingDataRequestDbQueryTest.java @@ -21,12 +21,9 @@ package org.onap.so.adapters.requestdb.rest; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.List; - import javax.transaction.Transactional; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,50 +40,50 @@ import org.springframework.test.context.junit4.SpringRunner; @SpringBootTest(classes = MSORequestDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @ActiveProfiles("test") public class RequestProcessingDataRequestDbQueryTest { - @Autowired - private RequestsDbClient client; - - @LocalServerPort - private int port; - - @Before - public void setPort() { - client.removePortFromEndpoint(); - client.setPortToEndpoint(Integer.toString(port)); - } - - @Test - @Transactional - public void RequestProcessingDataBySoRequestIdTest() { - String soRequestId = "00032ab7-na18-42e5-965d-8ea592502018"; - String tag = "pincFabricConfigRequest"; - RequestProcessingData firstEntry = new RequestProcessingData(); - RequestProcessingData secondEntry = new RequestProcessingData(); - List expectedList = new ArrayList<>(); - firstEntry.setSoRequestId(soRequestId); - firstEntry.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca715"); - firstEntry.setName("configurationId"); - firstEntry.setValue("52234bc0-d6a6-41d4-a901-79015e4877e2"); - firstEntry.setTag(tag); - secondEntry.setSoRequestId(soRequestId); - secondEntry.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca714"); - secondEntry.setName("requestAction"); - secondEntry.setValue("assign"); - secondEntry.setTag(tag); - expectedList.add(firstEntry); - expectedList.add(secondEntry); + @Autowired + private RequestsDbClient client; + + @LocalServerPort + private int port; + + @Before + public void setPort() { + client.removePortFromEndpoint(); + client.setPortToEndpoint(Integer.toString(port)); + } + + @Test + @Transactional + public void RequestProcessingDataBySoRequestIdTest() { + String soRequestId = "00032ab7-na18-42e5-965d-8ea592502018"; + String tag = "pincFabricConfigRequest"; + RequestProcessingData firstEntry = new RequestProcessingData(); + RequestProcessingData secondEntry = new RequestProcessingData(); + List expectedList = new ArrayList<>(); + firstEntry.setSoRequestId(soRequestId); + firstEntry.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca715"); + firstEntry.setName("configurationId"); + firstEntry.setValue("52234bc0-d6a6-41d4-a901-79015e4877e2"); + firstEntry.setTag(tag); + secondEntry.setSoRequestId(soRequestId); + secondEntry.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca714"); + secondEntry.setName("requestAction"); + secondEntry.setValue("assign"); + secondEntry.setTag(tag); + expectedList.add(firstEntry); + expectedList.add(secondEntry); - List dataFound = client.getRequestProcessingDataBySoRequestId(soRequestId); - //bean comparison with shazam fails serialization: Forgot to register a type adapter? - assertEquals(dataFound.get(0).getSoRequestId(), firstEntry.getSoRequestId()); - assertEquals(dataFound.get(0).getGroupingId(), firstEntry.getGroupingId()); - assertEquals(dataFound.get(0).getName(), firstEntry.getName()); - assertEquals(dataFound.get(0).getValue(), firstEntry.getValue()); - assertEquals(dataFound.get(0).getTag(), firstEntry.getTag()); - assertEquals(dataFound.get(1).getSoRequestId(), secondEntry.getSoRequestId()); - assertEquals(dataFound.get(1).getGroupingId(), secondEntry.getGroupingId()); - assertEquals(dataFound.get(1).getName(), secondEntry.getName()); - assertEquals(dataFound.get(1).getValue(), secondEntry.getValue()); - assertEquals(dataFound.get(1).getTag(), secondEntry.getTag()); - } + List dataFound = client.getRequestProcessingDataBySoRequestId(soRequestId); + // bean comparison with shazam fails serialization: Forgot to register a type adapter? + assertEquals(dataFound.get(0).getSoRequestId(), firstEntry.getSoRequestId()); + assertEquals(dataFound.get(0).getGroupingId(), firstEntry.getGroupingId()); + assertEquals(dataFound.get(0).getName(), firstEntry.getName()); + assertEquals(dataFound.get(0).getValue(), firstEntry.getValue()); + assertEquals(dataFound.get(0).getTag(), firstEntry.getTag()); + assertEquals(dataFound.get(1).getSoRequestId(), secondEntry.getSoRequestId()); + assertEquals(dataFound.get(1).getGroupingId(), secondEntry.getGroupingId()); + assertEquals(dataFound.get(1).getName(), secondEntry.getName()); + assertEquals(dataFound.get(1).getValue(), secondEntry.getValue()); + assertEquals(dataFound.get(1).getTag(), secondEntry.getTag()); + } } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/AllTestsTestSuite.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/AllTestsTestSuite.java index f15a93eaeb..ac520c24e3 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/AllTestsTestSuite.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/AllTestsTestSuite.java @@ -19,14 +19,14 @@ */ package org.onap.so.adapters.requestsdb; -import org.junit.runner.RunWith; +import org.junit.runner.RunWith; import com.googlecode.junittoolbox.SuiteClasses; import com.googlecode.junittoolbox.WildcardPatternSuite; @RunWith(WildcardPatternSuite.class) @SuiteClasses("**/*Test.class") public class AllTestsTestSuite { - // the class remains empty, - // used only as a holder for the above annotations + // the class remains empty, + // used only as a holder for the above annotations } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java index 4b783a781c..663be24318 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java @@ -21,10 +21,8 @@ package org.onap.so.adapters.requestsdb; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.List; - import org.junit.Test; import org.onap.so.db.request.beans.InfraActiveRequests; import org.onap.so.db.request.data.repository.ArchivedInfraRequestsRepository; @@ -34,45 +32,45 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; public class ArchiveInfraRequestsSchedulerTest extends RequestsAdapterBase { - - @Autowired - private ArchiveInfraRequestsScheduler scheduler; - - @Autowired - private InfraActiveRequestsRepository iarRepo; - - @Autowired - private ArchivedInfraRequestsRepository archivedRepo; - - @Value("${mso.infra-requests.archived.period}") - private int archivedPeriod; - - @Test - @Transactional - public void testArchiveInfraRequests() throws Exception { - String requestId1 = "requestId1"; - String requestId2 = "requestId2"; - - InfraActiveRequests iar1 = new InfraActiveRequests(); - iar1.setRequestId(requestId1); - iar1.setAction("action1"); - - InfraActiveRequests iar2 = new InfraActiveRequests(); - iar2.setRequestId(requestId2); - iar2.setAction("action2"); - - List requests = new ArrayList<>(); - requests.add(iar1); - requests.add(iar2); - iarRepo.saveAll(requests); - - scheduler.archiveInfraRequests(requests); - - assertEquals(2, archivedRepo.count()); - assertEquals(requestId1, archivedRepo.findById(requestId1) - .orElseThrow( () -> new Exception("Request Not Found")).getRequestId()); - assertEquals(requestId2, archivedRepo.findById(requestId2). - orElseThrow( () -> new Exception("Request Not Found")).getRequestId()); - } + + @Autowired + private ArchiveInfraRequestsScheduler scheduler; + + @Autowired + private InfraActiveRequestsRepository iarRepo; + + @Autowired + private ArchivedInfraRequestsRepository archivedRepo; + + @Value("${mso.infra-requests.archived.period}") + private int archivedPeriod; + + @Test + @Transactional + public void testArchiveInfraRequests() throws Exception { + String requestId1 = "requestId1"; + String requestId2 = "requestId2"; + + InfraActiveRequests iar1 = new InfraActiveRequests(); + iar1.setRequestId(requestId1); + iar1.setAction("action1"); + + InfraActiveRequests iar2 = new InfraActiveRequests(); + iar2.setRequestId(requestId2); + iar2.setAction("action2"); + + List requests = new ArrayList<>(); + requests.add(iar1); + requests.add(iar2); + iarRepo.saveAll(requests); + + scheduler.archiveInfraRequests(requests); + + assertEquals(2, archivedRepo.count()); + assertEquals(requestId1, + archivedRepo.findById(requestId1).orElseThrow(() -> new Exception("Request Not Found")).getRequestId()); + assertEquals(requestId2, + archivedRepo.findById(requestId2).orElseThrow(() -> new Exception("Request Not Found")).getRequestId()); + } } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java index c7804c8e0c..4ed3285a70 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/InfraActiveRequestsRepositoryCustomControllerTest.java @@ -23,15 +23,12 @@ package org.onap.so.adapters.requestsdb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; - import javax.ws.rs.core.MediaType; - import org.junit.Before; import org.junit.Test; import org.onap.so.db.request.beans.InfraActiveRequests; @@ -52,7 +49,7 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA @LocalServerPort private int port; - + @Value("${mso.adapters.requestDb.auth}") private String msoAdaptersAuth; @@ -68,7 +65,8 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA private void verifyInfraActiveRequests() { assertEquals(infraActiveRequests.getRequestId(), infraActiveRequestsResponse.getRequestId()); assertEquals(infraActiveRequests.getServiceInstanceId(), infraActiveRequestsResponse.getServiceInstanceId()); - assertEquals(infraActiveRequests.getServiceInstanceName(), infraActiveRequestsResponse.getServiceInstanceName()); + assertEquals(infraActiveRequests.getServiceInstanceName(), + infraActiveRequestsResponse.getServiceInstanceName()); assertEquals(infraActiveRequests.getVnfId(), infraActiveRequestsResponse.getVnfId()); assertEquals(infraActiveRequests.getVnfName(), infraActiveRequestsResponse.getVnfName()); assertEquals(infraActiveRequests.getVfModuleId(), infraActiveRequestsResponse.getVfModuleId()); @@ -88,7 +86,7 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA assertEquals(infraActiveRequests.getOperationalEnvName(), infraActiveRequestsResponse.getOperationalEnvName()); assertEquals(infraActiveRequests.getRequestStatus(), infraActiveRequestsResponse.getRequestStatus()); assertEquals(infraActiveRequests.getAction(), infraActiveRequestsResponse.getAction()); - assertEquals(infraActiveRequests.getRequestUrl(), infraActiveRequestsResponse.getRequestUrl()); + assertEquals(infraActiveRequests.getRequestUrl(), infraActiveRequestsResponse.getRequestUrl()); } @Before @@ -125,14 +123,14 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA infraActiveRequests.setOperationalEnvName(UUID.randomUUID().toString()); infraActiveRequests.setRequestStatus("IN_PROGRESS"); infraActiveRequests.setAction("create"); - infraActiveRequests.setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances"); + infraActiveRequests + .setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances"); HttpEntity entity = new HttpEntity(infraActiveRequests, headers); UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests")); - ResponseEntity response = restTemplate.exchange( - builder.toUriString(), - HttpMethod.POST, entity, String.class); + ResponseEntity response = + restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class); assertEquals(201, response.getStatusCodeValue()); } @@ -148,12 +146,11 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA HttpEntity> entity = new HttpEntity<>(requestMap, headers); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/getCloudOrchestrationFiltersFromInfraActive"); + UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl( + createURLWithPort("/infraActiveRequests") + "/getCloudOrchestrationFiltersFromInfraActive"); - ResponseEntity> response = restTemplate.exchange( - builder.toUriString(), - HttpMethod.POST, entity, new ParameterizedTypeReference>() { - }); + ResponseEntity> response = restTemplate.exchange(builder.toUriString(), + HttpMethod.POST, entity, new ParameterizedTypeReference>() {}); List iarr = response.getBody(); assertEquals(200, response.getStatusCodeValue()); @@ -180,12 +177,11 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA requestMap.put("serviceInstanceName", values); HttpEntity>> entityList = new HttpEntity(requestMap, headers); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/getOrchestrationFiltersFromInfraActive"); + UriComponentsBuilder builder = UriComponentsBuilder + .fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/getOrchestrationFiltersFromInfraActive"); - ResponseEntity> response = restTemplate.exchange( - builder.toUriString(), - HttpMethod.POST, entityList, new ParameterizedTypeReference>() { - }); + ResponseEntity> response = restTemplate.exchange(builder.toUriString(), + HttpMethod.POST, entityList, new ParameterizedTypeReference>() {}); List iarr = response.getBody(); @@ -200,13 +196,13 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA @Test public void checkVnfIdStatusTest() { - - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests" + "/checkVnfIdStatus/" + infraActiveRequests.getOperationalEnvId())); + + UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort( + "/infraActiveRequests" + "/checkVnfIdStatus/" + infraActiveRequests.getOperationalEnvId())); HttpEntity entity = new HttpEntity(HttpEntity.EMPTY, headers); - ResponseEntity response = restTemplate.exchange( - builder.toUriString(), - HttpMethod.GET,entity , InfraActiveRequests.class); + ResponseEntity response = + restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, InfraActiveRequests.class); infraActiveRequestsResponse = response.getBody(); @@ -218,17 +214,17 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA @Test public void checkInstanceNameDuplicateTest() { - InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest = new InstanceNameDuplicateCheckRequest((HashMap) null, - infraActiveRequests.getOperationalEnvName(), - infraActiveRequests.getRequestScope()); + InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest = + new InstanceNameDuplicateCheckRequest((HashMap) null, + infraActiveRequests.getOperationalEnvName(), infraActiveRequests.getRequestScope()); - HttpEntity entityList = new HttpEntity(instanceNameDuplicateCheckRequest, headers); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate"); + HttpEntity entityList = + new HttpEntity(instanceNameDuplicateCheckRequest, headers); + UriComponentsBuilder builder = UriComponentsBuilder + .fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate"); - ResponseEntity response = restTemplate.exchange( - builder.toUriString(), - HttpMethod.POST, entityList, new ParameterizedTypeReference() { - }); + ResponseEntity response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, + entityList, new ParameterizedTypeReference() {}); infraActiveRequestsResponse = response.getBody(); @@ -243,17 +239,16 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA Map requestMap = new HashMap<>(); requestMap.put("operationalEnvironmentId", infraActiveRequests.getOperationalEnvId()); - InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest = new InstanceNameDuplicateCheckRequest((HashMap) requestMap, - null, - infraActiveRequests.getRequestScope()); + InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest = new InstanceNameDuplicateCheckRequest( + (HashMap) requestMap, null, infraActiveRequests.getRequestScope()); - HttpEntity entityList = new HttpEntity(instanceNameDuplicateCheckRequest, headers); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate"); + HttpEntity entityList = + new HttpEntity(instanceNameDuplicateCheckRequest, headers); + UriComponentsBuilder builder = UriComponentsBuilder + .fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate"); - ResponseEntity response = restTemplate.exchange( - builder.toUriString(), - HttpMethod.POST, entityList, new ParameterizedTypeReference() { - }); + ResponseEntity response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, + entityList, new ParameterizedTypeReference() {}); infraActiveRequestsResponse = response.getBody(); @@ -265,15 +260,16 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA @Test public void checkInstanceNameDuplicateTestNotFound() { - String instanceNameDuplicateCheckRequest = "{\r\n\t \"instanceName\":\"TestNotFoundInstanceName\",\r\n\t \"requestScope\":\"testasdfasdfasdf\"\r\n}"; + String instanceNameDuplicateCheckRequest = + "{\r\n\t \"instanceName\":\"TestNotFoundInstanceName\",\r\n\t \"requestScope\":\"testasdfasdfasdf\"\r\n}"; - HttpEntity entityList = new HttpEntity(instanceNameDuplicateCheckRequest, headers); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate"); + HttpEntity entityList = + new HttpEntity(instanceNameDuplicateCheckRequest, headers); + UriComponentsBuilder builder = UriComponentsBuilder + .fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate"); - ResponseEntity response = restTemplate.exchange( - builder.toUriString(), - HttpMethod.POST, entityList, new ParameterizedTypeReference() { - }); + ResponseEntity response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, + entityList, new ParameterizedTypeReference() {}); assertEquals(200, response.getStatusCodeValue()); assertEquals(null, response.getBody()); @@ -285,17 +281,16 @@ public class InfraActiveRequestsRepositoryCustomControllerTest extends RequestsA Map requestMap = new HashMap<>(); requestMap.put("operationalEnvironmentId", "NotFoundOperationalEnvId"); - InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest = new InstanceNameDuplicateCheckRequest((HashMap) requestMap, - null, - infraActiveRequests.getRequestScope()); + InstanceNameDuplicateCheckRequest instanceNameDuplicateCheckRequest = new InstanceNameDuplicateCheckRequest( + (HashMap) requestMap, null, infraActiveRequests.getRequestScope()); - HttpEntity entityList = new HttpEntity(instanceNameDuplicateCheckRequest, headers); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate"); + HttpEntity entityList = + new HttpEntity(instanceNameDuplicateCheckRequest, headers); + UriComponentsBuilder builder = UriComponentsBuilder + .fromHttpUrl(createURLWithPort("/infraActiveRequests") + "/checkInstanceNameDuplicate"); - ResponseEntity response = restTemplate.exchange( - builder.toUriString(), - HttpMethod.POST, entityList, new ParameterizedTypeReference() { - }); + ResponseEntity response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, + entityList, new ParameterizedTypeReference() {}); infraActiveRequestsResponse = response.getBody(); diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/HealthCheckHandlerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/HealthCheckHandlerTest.java index b911396370..514e5ad923 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/HealthCheckHandlerTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/HealthCheckHandlerTest.java @@ -22,11 +22,8 @@ package org.onap.so.adapters.requestsdb.adapters; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; - import java.util.Map; - import javax.ws.rs.core.Response; - import org.json.JSONException; import org.junit.Test; import org.onap.logging.ref.slf4j.ONAPLogConstants; @@ -38,55 +35,53 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; - import ch.qos.logback.classic.spi.ILoggingEvent; public class HealthCheckHandlerTest extends RequestsAdapterBase { - - @LocalServerPort - private int port; - TestRestTemplate restTemplate = new TestRestTemplate(); + @LocalServerPort + private int port; + + TestRestTemplate restTemplate = new TestRestTemplate(); - HttpHeaders headers = new HttpHeaders(); + HttpHeaders headers = new HttpHeaders(); - - @Test - public void testHealthcheck() throws JSONException { - TestAppender.events.clear(); - HttpEntity entity = new HttpEntity(null, headers); - ResponseEntity response = restTemplate.exchange( - createURLWithPort("/manage/health"), - HttpMethod.GET, entity, String.class); - - assertEquals(Response.Status.OK.getStatusCode(),response.getStatusCode().value()); - for(ILoggingEvent logEvent : TestAppender.events) - if(logEvent.getLoggerName().equals("org.onap.so.logging.spring.interceptor.LoggingInterceptor") && - logEvent.getMarker() != null && logEvent.getMarker().getName().equals("ENTRY") - ){ - Map mdc = logEvent.getMDCPropertyMap(); + @Test + public void testHealthcheck() throws JSONException { + TestAppender.events.clear(); + HttpEntity entity = new HttpEntity(null, headers); + + ResponseEntity response = + restTemplate.exchange(createURLWithPort("/manage/health"), HttpMethod.GET, entity, String.class); + + assertEquals(Response.Status.OK.getStatusCode(), response.getStatusCode().value()); + for (ILoggingEvent logEvent : TestAppender.events) + if (logEvent.getLoggerName().equals("org.onap.so.logging.spring.interceptor.LoggingInterceptor") + && logEvent.getMarker() != null && logEvent.getMarker().getName().equals("ENTRY")) { + Map mdc = logEvent.getMDCPropertyMap(); assertNotNull(mdc.get(ONAPLogConstants.MDCs.INSTANCE_UUID)); assertNotNull(mdc.get(ONAPLogConstants.MDCs.REQUEST_ID)); assertNotNull(mdc.get(ONAPLogConstants.MDCs.INVOCATION_ID)); - assertEquals("",mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME)); - assertEquals("/manage/health",mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); - assertEquals("INPROGRESS",mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); - }else if(logEvent.getLoggerName().equals("org.onap.so.logging.spring.interceptor.LoggingInterceptor") && - logEvent.getMarker() != null && logEvent.getMarker()!= null && logEvent.getMarker().getName().equals("EXIT")){ - Map mdc = logEvent.getMDCPropertyMap(); + assertEquals("", mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME)); + assertEquals("/manage/health", mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); + assertEquals("INPROGRESS", mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); + } else if (logEvent.getLoggerName().equals("org.onap.so.logging.spring.interceptor.LoggingInterceptor") + && logEvent.getMarker() != null && logEvent.getMarker() != null + && logEvent.getMarker().getName().equals("EXIT")) { + Map mdc = logEvent.getMDCPropertyMap(); assertNotNull(mdc.get(ONAPLogConstants.MDCs.REQUEST_ID)); assertNotNull(mdc.get(ONAPLogConstants.MDCs.INVOCATION_ID)); - assertEquals("200",mdc.get(ONAPLogConstants.MDCs.RESPONSE_CODE)); - assertEquals("",mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME)); - assertEquals("/manage/health",mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); - assertEquals("COMPLETED",mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); + assertEquals("200", mdc.get(ONAPLogConstants.MDCs.RESPONSE_CODE)); + assertEquals("", mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME)); + assertEquals("/manage/health", mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); + assertEquals("COMPLETED", mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); } TestAppender.events.clear(); - } - - private String createURLWithPort(String uri) { - return "http://localhost:" + port + uri; - } + } + + private String createURLWithPort(String uri) { + return "http://localhost:" + port + uri; + } } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java index f6950d9777..e53b957210 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java @@ -25,11 +25,9 @@ import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.List; import java.util.Map; - import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.junit.Before; import org.junit.Rule; @@ -49,469 +47,422 @@ import org.onap.so.db.request.data.repository.ResourceOperationStatusRepository; import org.onap.so.requestsdb.RequestsDbConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.server.LocalServerPort; - import ch.qos.logback.classic.spi.ILoggingEvent; public class MSORequestDBImplTest extends RequestsAdapterBase { - @LocalServerPort - private int port; + @LocalServerPort + private int port; + + private MsoRequestsDbAdapter dbAdapter; - private MsoRequestsDbAdapter dbAdapter; - @Autowired private OperationStatusRepository operationStatusRepository; - + @Autowired private ResourceOperationStatusRepository resourceOperationStatusRepo; @Rule public ExpectedException thrown = ExpectedException.none(); - - public InfraActiveRequests setupTestEntities() { - return buildTestRequest(); - } - - @Before - public void before() throws MsoRequestsDbException{ + + public InfraActiveRequests setupTestEntities() { + return buildTestRequest(); + } + + @Before + public void before() throws MsoRequestsDbException { JaxWsProxyFactoryBean jaxWsProxyFactory = new JaxWsProxyFactoryBean(); jaxWsProxyFactory.setServiceClass(MsoRequestsDbAdapter.class); jaxWsProxyFactory.setAddress("http://localhost:" + port + "/services/RequestsDbAdapter"); jaxWsProxyFactory.setUsername("bpel"); jaxWsProxyFactory.setPassword("mso-db-1507!"); dbAdapter = (MsoRequestsDbAdapter) jaxWsProxyFactory.create(); - + InfraActiveRequests testRequest = this.buildTestRequest(); - dbAdapter.updateInfraRequest ( testRequest.getRequestId(), - testRequest.getLastModifiedBy(), - testRequest.getStatusMessage(), - testRequest.getResponseBody(), - RequestStatusType.valueOf(testRequest.getRequestStatus()), - testRequest.getProgress().toString(), - testRequest.getVnfOutputs(), - testRequest.getServiceInstanceId(), - testRequest.getNetworkId(), - testRequest.getVnfId(), - testRequest.getVfModuleId(), - testRequest.getVolumeGroupId(), - testRequest.getServiceInstanceName(), - testRequest.getConfigurationId(), - testRequest.getConfigurationName(), - testRequest.getVfModuleName()); - - - } - - private InfraActiveRequests buildTestRequest() { - InfraActiveRequests testRequest= new InfraActiveRequests(); - testRequest.setRequestId("00032ab7-3fb3-42e5-965d-8ea592502017"); - testRequest.setClientRequestId("00032ab7-3fb3-42e5-965d-8ea592502016"); - testRequest.setRequestStatus("COMPLETE"); - testRequest.setStatusMessage("Vf Module has been deleted successfully."); - testRequest.setProgress((long) 100); - testRequest.setSource("VID"); - testRequest.setTenantId("6accefef3cb442ff9e644d589fb04107"); - testRequest.setServiceInstanceId("e3b5744d-2ad1-4cdd-8390-c999a38829bc"); - testRequest.setRequestAction("deleteInstance"); - testRequest.setRequestScope("vfModule"); - testRequest.setAction("deleteInstance"); - testRequest.setAicCloudRegion("mtn6"); - testRequest.setLastModifiedBy("BPMN"); - testRequest.setVfModuleId("c7d527b1-7a91-49fd-b97d-1c8c0f4a7992"); - testRequest.setVfModuleModelName("vSAMP10aDEV::base::module-0"); - testRequest.setVnfId("b92f60c8-8de3-46c1-8dc1-e4390ac2b005"); - testRequest.setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances"); - testRequest.setVolumeGroupId("volumeGroupId"); - testRequest.setServiceInstanceName("serviceInstanceName"); - testRequest.setConfigurationId("configurationId"); - testRequest.setConfigurationName("configurationName"); - testRequest.setNetworkId("networkId"); - testRequest.setResponseBody("responseBody"); - testRequest.setVfModuleName("vfModuleName"); - testRequest.setVnfOutputs("vnfOutputs"); - return testRequest; - } - - @Test - public void getByRequestId() throws MsoRequestsDbException { - - InfraActiveRequests testRequest = setupTestEntities(); - // Given - String requestId = "00032ab7-3fb3-42e5-965d-8ea592502017"; - - // When - InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(requestId); - if(infraRequest ==null) - fail("Null infraRequest"); - - // Then - assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime").ignoring("startTime").ignoring("modifyTime")); - } - - - @Test - public void getByInvalidRequestId() throws MsoRequestsDbException { - // Given - String requestId = "invalidRequestId"; - - try { - dbAdapter.getInfraRequest(requestId); - fail("Expected MsoRequestsDbException to be thrown"); - } catch (Exception e) { - assertEquals(e.getMessage(),"Error retrieving MSO Infra Requests DB for Request ID invalidRequestId"); - } - } - - @Test - public void getByClientRequestId() throws MsoRequestsDbException { - InfraActiveRequests testRequest = setupTestEntities(); - // Given - String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016"; - - // When - InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId); - if(infraRequest ==null) - fail("Null infraRequest"); - - // Then - assertEquals(clientRequestId, infraRequest.getClientRequestId()); - } - - - @Test - public void updateInfraRequest() throws MsoRequestsDbException { - InfraActiveRequests testRequest = setupTestEntities(); - // Given - String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016"; - - - // When - String lastModifiedBy = "UNIT TEST"; - String statusMessage = "TESTING THE UDPATES"; - String progress = "50"; - String vnfOutputs = "VNF OUTPUTS"; - String networkId = "New NetworkID"; - String vnfId = "NEWVNFID"; - String volumeGroupId = "NewVolumeGroupId"; - String serviceInstanceName = "NewServiceInstanceName"; - String configurationId = "NewConfigurationId"; - String configurationName = "NewConfigurationName"; - String vfModuleName = "VFModuleName"; - RequestStatusType requestStatus = RequestStatusType.COMPLETE ; - String responseBody = "NewResponseBody"; - String vfModuleId = "NEW VF MODULEID"; - String serviceInstanceId = " new serv ind"; - - - testRequest.setVolumeGroupId(volumeGroupId); - testRequest.setServiceInstanceName(serviceInstanceName); - testRequest.setConfigurationId(configurationId); - testRequest.setConfigurationName(configurationName); - testRequest.setNetworkId(networkId); - testRequest.setResponseBody(responseBody); - testRequest.setStatusMessage(statusMessage); - testRequest.setProgress((long) 50); - testRequest.setServiceInstanceId(lastModifiedBy); - testRequest.setLastModifiedBy(lastModifiedBy); - testRequest.setVfModuleId(vfModuleId); - testRequest.setVfModuleName(vfModuleName); - testRequest.setVnfId(vnfId); - testRequest.setServiceInstanceId(serviceInstanceId); - testRequest.setVfModuleName(vfModuleName); - testRequest.setVnfOutputs(vnfOutputs); - - - dbAdapter.updateInfraRequest ( testRequest.getRequestId(), - lastModifiedBy, - statusMessage, - responseBody, - requestStatus, - progress, - vnfOutputs, - serviceInstanceId, - networkId, - vnfId, - vfModuleId, - volumeGroupId, - serviceInstanceName, - configurationId, - configurationName, - vfModuleName); - InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId); - // Then - assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime").ignoring("startTime").ignoring("modifyTime")); - - - } - - @Test - public void UpdateByInvalidRequestId() throws MsoRequestsDbException { - // Given - String requestId = "invalidRequestId"; - - try { - dbAdapter.updateInfraRequest ( requestId, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null); - fail("Expected MsoRequestsDbException to be thrown"); - } catch (Exception e) { - assertEquals(e.getMessage(),"Error retrieving MSO Infra Requests DB for Request ID invalidRequestId"); - } - } - - - @Test - public void updateInfraRequestNulls() throws MsoRequestsDbException { - InfraActiveRequests testRequest = setupTestEntities(); - // Given - String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016"; - - // When - dbAdapter.updateInfraRequest ( testRequest.getRequestId(), - testRequest.getLastModifiedBy(), - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null); - InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId); - // Then - assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime").ignoring("startTime").ignoring("modifyTime")); - } - - @Test - public void getSiteStatusNotDisabled() throws MsoRequestsDbException { - setupTestEntities(); - // Given - String siteName = "siteName"; - - // When - boolean siteDisabled = dbAdapter.getSiteStatus(siteName); - - // Then - assertEquals(siteDisabled, true); - } - - @Test - public void getSiteStatusDisabled() throws MsoRequestsDbException { - setupTestEntities(); - // Given - String siteName = "testSite"; - - // When - boolean siteDisabled = dbAdapter.getSiteStatus(siteName); - - // Then - assertEquals(siteDisabled, false); - } - - @Test - public void updateServiceOperation() throws MsoRequestsDbException{ - String serviceId = "serviceid"; - String operationId = "operationid"; - String serviceName = "servicename"; - String operation = "newOperationType"; - String userId = "NewUserId"; - String result = "NewResult"; - String operationContent = "newOperationContent"; - String progress = "Newprogress"; - String reason = "NewReason"; - - OperationStatus updatedOperationStatus = new OperationStatus(); - - - - updatedOperationStatus.setServiceId(serviceId); - updatedOperationStatus.setServiceName(serviceName); - updatedOperationStatus.setOperationId(operationId); - updatedOperationStatus.setOperation(operation); - updatedOperationStatus.setUserId(userId); - updatedOperationStatus.setResult(result); - updatedOperationStatus.setProgress(progress); - updatedOperationStatus.setReason(reason); - updatedOperationStatus.setOperationContent(operationContent); - - dbAdapter.updateServiceOperationStatus(serviceId, operationId, operation, userId, - result, operationContent, progress, reason); - OperationStatus dbOpStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId,operationId); - assertThat(dbOpStatus, sameBeanAs(updatedOperationStatus).ignoring("operateAt").ignoring("finishedAt")); - } - - - @Test - public void updateServiceOperation_Not_Found() throws MsoRequestsDbException{ - TestAppender.events.clear(); - String serviceId = "badserviceId"; - String operationId = "operationid"; - String operation = "newOperationType"; - String userId = "NewUserId"; - String result = "NewResult"; - String operationContent = "newOperationContent"; - String progress = "Newprogress"; - String reason = "NewReason"; - - OperationStatus updatedOperationStatus = new OperationStatus(); - - - - updatedOperationStatus.setServiceId(serviceId); - updatedOperationStatus.setOperationId(operationId); - updatedOperationStatus.setOperation(operation); - updatedOperationStatus.setUserId(userId); - updatedOperationStatus.setResult(result); - updatedOperationStatus.setProgress(progress); - updatedOperationStatus.setReason(reason); - updatedOperationStatus.setOperationContent(operationContent); - - dbAdapter.updateServiceOperationStatus(serviceId, operationId, operation, userId, - result, operationContent, progress, reason); - OperationStatus dbOpStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId,operationId); - assertThat(dbOpStatus, sameBeanAs(updatedOperationStatus).ignoring("operateAt").ignoring("finishedAt")); - } - - @Test - public void initResourceOperationStatus() throws MsoRequestsDbException{ - String resourceTemplateUUIDs = "template1:template2:template3:"; - String serviceId = "serviceId"; - String operationId = "operationId"; - String operationType = "operationType"; - - ResourceOperationStatus resource1 = new ResourceOperationStatus(); - resource1.setOperationId(operationId); - resource1.setServiceId(serviceId); - resource1.setResourceTemplateUUID("template1"); - resource1.setOperType(operationType); - resource1.setStatus(RequestsDbConstant.Status.PROCESSING); - resource1.setStatusDescription("Waiting for start"); - - ResourceOperationStatus resource2 = new ResourceOperationStatus(); - resource2.setOperationId(operationId); - resource2.setServiceId(serviceId); - resource2.setResourceTemplateUUID("template2"); - resource2.setOperType(operationType); - resource2.setStatus(RequestsDbConstant.Status.PROCESSING); - resource2.setStatusDescription("Waiting for start"); - - ResourceOperationStatus resource3 = new ResourceOperationStatus(); - resource3.setOperationId(operationId); - resource3.setServiceId(serviceId); - resource3.setResourceTemplateUUID("template3"); - resource3.setOperType(operationType); - resource3.setStatus(RequestsDbConstant.Status.PROCESSING); - resource3.setStatusDescription("Waiting for start"); - - List expectedResult = new ArrayList(); - expectedResult.add(resource1); - expectedResult.add(resource2); - expectedResult.add(resource3); - - dbAdapter.initResourceOperationStatus(serviceId, operationId, operationType,resourceTemplateUUIDs); - List testList = resourceOperationStatusRepo.findByServiceIdAndOperationId(serviceId,operationId); - assertThat(testList, sameBeanAs(expectedResult)); - } - - @Test - public void getResourceOperationStatus() throws MsoRequestsDbException{ - String resourceTemplateUUIDs = "template1"; - String serviceId = "serviceId"; - String operationId = "operationId"; - String operationType = "operationType"; - - ResourceOperationStatus resource1 = new ResourceOperationStatus(); - resource1.setOperationId(operationId); - resource1.setServiceId(serviceId); - resource1.setResourceTemplateUUID("template1"); - resource1.setOperType(operationType); - resource1.setStatus(RequestsDbConstant.Status.PROCESSING); - resource1.setStatusDescription("Waiting for start"); - - - dbAdapter.initResourceOperationStatus(serviceId, operationId, operationType,resourceTemplateUUIDs); - - ResourceOperationStatus actualResource = dbAdapter.getResourceOperationStatus(serviceId, operationId,"template1"); - assertThat(actualResource, sameBeanAs(resource1)); - } - - @Test - public void updateResourceOperationStatus() throws MsoRequestsDbException{ - TestAppender.events.clear(); - String resourceTemplateUUID = "template1"; - String serviceId = "serviceId"; - String operationId = "operationId"; - String operationType = "operationType"; - String resourceInstanceID = "resourceInstanceID"; - String jobId = "jobId"; - String status = RequestsDbConstant.Status.FINISHED; - String progress = "50"; - String errorCode = "errorCode"; - String statusDescription = "statusDescription"; - - - ResourceOperationStatus expectedResource = new ResourceOperationStatus(); - expectedResource.setOperationId(operationId); - expectedResource.setServiceId(serviceId); - expectedResource.setResourceTemplateUUID(resourceTemplateUUID); - expectedResource.setOperType(operationType); - expectedResource.setJobId(jobId); - expectedResource.setErrorCode(errorCode); - expectedResource.setStatus(RequestsDbConstant.Status.FINISHED); - expectedResource.setStatusDescription(statusDescription); - expectedResource.setProgress(progress); - expectedResource.setResourceInstanceID(resourceInstanceID); - - - dbAdapter.updateResourceOperationStatus(serviceId, operationId, resourceTemplateUUID, - operationType, resourceInstanceID, jobId, status, progress, - errorCode, statusDescription); - - ResourceOperationStatus actualResource = dbAdapter.getResourceOperationStatus(serviceId, operationId,"template1"); - assertThat(actualResource, sameBeanAs(expectedResource)); - - for(ILoggingEvent logEvent : TestAppender.events) - if(logEvent.getLoggerName().equals("org.onap.so.logging.cxf.interceptor.SOAPLoggingInInterceptor") && - logEvent.getMarker().getName().equals("ENTRY") - ){ - Map mdc = logEvent.getMDCPropertyMap(); + dbAdapter.updateInfraRequest(testRequest.getRequestId(), testRequest.getLastModifiedBy(), + testRequest.getStatusMessage(), testRequest.getResponseBody(), + RequestStatusType.valueOf(testRequest.getRequestStatus()), testRequest.getProgress().toString(), + testRequest.getVnfOutputs(), testRequest.getServiceInstanceId(), testRequest.getNetworkId(), + testRequest.getVnfId(), testRequest.getVfModuleId(), testRequest.getVolumeGroupId(), + testRequest.getServiceInstanceName(), testRequest.getConfigurationId(), + testRequest.getConfigurationName(), testRequest.getVfModuleName()); + + + } + + private InfraActiveRequests buildTestRequest() { + InfraActiveRequests testRequest = new InfraActiveRequests(); + testRequest.setRequestId("00032ab7-3fb3-42e5-965d-8ea592502017"); + testRequest.setClientRequestId("00032ab7-3fb3-42e5-965d-8ea592502016"); + testRequest.setRequestStatus("COMPLETE"); + testRequest.setStatusMessage("Vf Module has been deleted successfully."); + testRequest.setProgress((long) 100); + testRequest.setSource("VID"); + testRequest.setTenantId("6accefef3cb442ff9e644d589fb04107"); + testRequest.setServiceInstanceId("e3b5744d-2ad1-4cdd-8390-c999a38829bc"); + testRequest.setRequestAction("deleteInstance"); + testRequest.setRequestScope("vfModule"); + testRequest.setAction("deleteInstance"); + testRequest.setAicCloudRegion("mtn6"); + testRequest.setLastModifiedBy("BPMN"); + testRequest.setVfModuleId("c7d527b1-7a91-49fd-b97d-1c8c0f4a7992"); + testRequest.setVfModuleModelName("vSAMP10aDEV::base::module-0"); + testRequest.setVnfId("b92f60c8-8de3-46c1-8dc1-e4390ac2b005"); + testRequest.setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances"); + testRequest.setVolumeGroupId("volumeGroupId"); + testRequest.setServiceInstanceName("serviceInstanceName"); + testRequest.setConfigurationId("configurationId"); + testRequest.setConfigurationName("configurationName"); + testRequest.setNetworkId("networkId"); + testRequest.setResponseBody("responseBody"); + testRequest.setVfModuleName("vfModuleName"); + testRequest.setVnfOutputs("vnfOutputs"); + return testRequest; + } + + @Test + public void getByRequestId() throws MsoRequestsDbException { + + InfraActiveRequests testRequest = setupTestEntities(); + // Given + String requestId = "00032ab7-3fb3-42e5-965d-8ea592502017"; + + // When + InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(requestId); + if (infraRequest == null) + fail("Null infraRequest"); + + // Then + assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime") + .ignoring("startTime").ignoring("modifyTime")); + } + + + @Test + public void getByInvalidRequestId() throws MsoRequestsDbException { + // Given + String requestId = "invalidRequestId"; + + try { + dbAdapter.getInfraRequest(requestId); + fail("Expected MsoRequestsDbException to be thrown"); + } catch (Exception e) { + assertEquals(e.getMessage(), "Error retrieving MSO Infra Requests DB for Request ID invalidRequestId"); + } + } + + @Test + public void getByClientRequestId() throws MsoRequestsDbException { + InfraActiveRequests testRequest = setupTestEntities(); + // Given + String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016"; + + // When + InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId); + if (infraRequest == null) + fail("Null infraRequest"); + + // Then + assertEquals(clientRequestId, infraRequest.getClientRequestId()); + } + + + @Test + public void updateInfraRequest() throws MsoRequestsDbException { + InfraActiveRequests testRequest = setupTestEntities(); + // Given + String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016"; + + + // When + String lastModifiedBy = "UNIT TEST"; + String statusMessage = "TESTING THE UDPATES"; + String progress = "50"; + String vnfOutputs = "VNF OUTPUTS"; + String networkId = "New NetworkID"; + String vnfId = "NEWVNFID"; + String volumeGroupId = "NewVolumeGroupId"; + String serviceInstanceName = "NewServiceInstanceName"; + String configurationId = "NewConfigurationId"; + String configurationName = "NewConfigurationName"; + String vfModuleName = "VFModuleName"; + RequestStatusType requestStatus = RequestStatusType.COMPLETE; + String responseBody = "NewResponseBody"; + String vfModuleId = "NEW VF MODULEID"; + String serviceInstanceId = " new serv ind"; + + + testRequest.setVolumeGroupId(volumeGroupId); + testRequest.setServiceInstanceName(serviceInstanceName); + testRequest.setConfigurationId(configurationId); + testRequest.setConfigurationName(configurationName); + testRequest.setNetworkId(networkId); + testRequest.setResponseBody(responseBody); + testRequest.setStatusMessage(statusMessage); + testRequest.setProgress((long) 50); + testRequest.setServiceInstanceId(lastModifiedBy); + testRequest.setLastModifiedBy(lastModifiedBy); + testRequest.setVfModuleId(vfModuleId); + testRequest.setVfModuleName(vfModuleName); + testRequest.setVnfId(vnfId); + testRequest.setServiceInstanceId(serviceInstanceId); + testRequest.setVfModuleName(vfModuleName); + testRequest.setVnfOutputs(vnfOutputs); + + + dbAdapter.updateInfraRequest(testRequest.getRequestId(), lastModifiedBy, statusMessage, responseBody, + requestStatus, progress, vnfOutputs, serviceInstanceId, networkId, vnfId, vfModuleId, volumeGroupId, + serviceInstanceName, configurationId, configurationName, vfModuleName); + InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId); + // Then + assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime") + .ignoring("startTime").ignoring("modifyTime")); + + + } + + @Test + public void UpdateByInvalidRequestId() throws MsoRequestsDbException { + // Given + String requestId = "invalidRequestId"; + + try { + dbAdapter.updateInfraRequest(requestId, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null); + fail("Expected MsoRequestsDbException to be thrown"); + } catch (Exception e) { + assertEquals(e.getMessage(), "Error retrieving MSO Infra Requests DB for Request ID invalidRequestId"); + } + } + + + @Test + public void updateInfraRequestNulls() throws MsoRequestsDbException { + InfraActiveRequests testRequest = setupTestEntities(); + // Given + String clientRequestId = "00032ab7-3fb3-42e5-965d-8ea592502016"; + + // When + dbAdapter.updateInfraRequest(testRequest.getRequestId(), testRequest.getLastModifiedBy(), null, null, null, + null, null, null, null, null, null, null, null, null, null, null); + InfraActiveRequests infraRequest = dbAdapter.getInfraRequest(clientRequestId); + // Then + assertThat(infraRequest, sameBeanAs(testRequest).ignoring("requestBody").ignoring("endTime") + .ignoring("startTime").ignoring("modifyTime")); + } + + @Test + public void getSiteStatusNotDisabled() throws MsoRequestsDbException { + setupTestEntities(); + // Given + String siteName = "siteName"; + + // When + boolean siteDisabled = dbAdapter.getSiteStatus(siteName); + + // Then + assertEquals(siteDisabled, true); + } + + @Test + public void getSiteStatusDisabled() throws MsoRequestsDbException { + setupTestEntities(); + // Given + String siteName = "testSite"; + + // When + boolean siteDisabled = dbAdapter.getSiteStatus(siteName); + + // Then + assertEquals(siteDisabled, false); + } + + @Test + public void updateServiceOperation() throws MsoRequestsDbException { + String serviceId = "serviceid"; + String operationId = "operationid"; + String serviceName = "servicename"; + String operation = "newOperationType"; + String userId = "NewUserId"; + String result = "NewResult"; + String operationContent = "newOperationContent"; + String progress = "Newprogress"; + String reason = "NewReason"; + + OperationStatus updatedOperationStatus = new OperationStatus(); + + + + updatedOperationStatus.setServiceId(serviceId); + updatedOperationStatus.setServiceName(serviceName); + updatedOperationStatus.setOperationId(operationId); + updatedOperationStatus.setOperation(operation); + updatedOperationStatus.setUserId(userId); + updatedOperationStatus.setResult(result); + updatedOperationStatus.setProgress(progress); + updatedOperationStatus.setReason(reason); + updatedOperationStatus.setOperationContent(operationContent); + + dbAdapter.updateServiceOperationStatus(serviceId, operationId, operation, userId, result, operationContent, + progress, reason); + OperationStatus dbOpStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId); + assertThat(dbOpStatus, sameBeanAs(updatedOperationStatus).ignoring("operateAt").ignoring("finishedAt")); + } + + + @Test + public void updateServiceOperation_Not_Found() throws MsoRequestsDbException { + TestAppender.events.clear(); + String serviceId = "badserviceId"; + String operationId = "operationid"; + String operation = "newOperationType"; + String userId = "NewUserId"; + String result = "NewResult"; + String operationContent = "newOperationContent"; + String progress = "Newprogress"; + String reason = "NewReason"; + + OperationStatus updatedOperationStatus = new OperationStatus(); + + + + updatedOperationStatus.setServiceId(serviceId); + updatedOperationStatus.setOperationId(operationId); + updatedOperationStatus.setOperation(operation); + updatedOperationStatus.setUserId(userId); + updatedOperationStatus.setResult(result); + updatedOperationStatus.setProgress(progress); + updatedOperationStatus.setReason(reason); + updatedOperationStatus.setOperationContent(operationContent); + + dbAdapter.updateServiceOperationStatus(serviceId, operationId, operation, userId, result, operationContent, + progress, reason); + OperationStatus dbOpStatus = operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId); + assertThat(dbOpStatus, sameBeanAs(updatedOperationStatus).ignoring("operateAt").ignoring("finishedAt")); + } + + @Test + public void initResourceOperationStatus() throws MsoRequestsDbException { + String resourceTemplateUUIDs = "template1:template2:template3:"; + String serviceId = "serviceId"; + String operationId = "operationId"; + String operationType = "operationType"; + + ResourceOperationStatus resource1 = new ResourceOperationStatus(); + resource1.setOperationId(operationId); + resource1.setServiceId(serviceId); + resource1.setResourceTemplateUUID("template1"); + resource1.setOperType(operationType); + resource1.setStatus(RequestsDbConstant.Status.PROCESSING); + resource1.setStatusDescription("Waiting for start"); + + ResourceOperationStatus resource2 = new ResourceOperationStatus(); + resource2.setOperationId(operationId); + resource2.setServiceId(serviceId); + resource2.setResourceTemplateUUID("template2"); + resource2.setOperType(operationType); + resource2.setStatus(RequestsDbConstant.Status.PROCESSING); + resource2.setStatusDescription("Waiting for start"); + + ResourceOperationStatus resource3 = new ResourceOperationStatus(); + resource3.setOperationId(operationId); + resource3.setServiceId(serviceId); + resource3.setResourceTemplateUUID("template3"); + resource3.setOperType(operationType); + resource3.setStatus(RequestsDbConstant.Status.PROCESSING); + resource3.setStatusDescription("Waiting for start"); + + List expectedResult = new ArrayList(); + expectedResult.add(resource1); + expectedResult.add(resource2); + expectedResult.add(resource3); + + dbAdapter.initResourceOperationStatus(serviceId, operationId, operationType, resourceTemplateUUIDs); + List testList = + resourceOperationStatusRepo.findByServiceIdAndOperationId(serviceId, operationId); + assertThat(testList, sameBeanAs(expectedResult)); + } + + @Test + public void getResourceOperationStatus() throws MsoRequestsDbException { + String resourceTemplateUUIDs = "template1"; + String serviceId = "serviceId"; + String operationId = "operationId"; + String operationType = "operationType"; + + ResourceOperationStatus resource1 = new ResourceOperationStatus(); + resource1.setOperationId(operationId); + resource1.setServiceId(serviceId); + resource1.setResourceTemplateUUID("template1"); + resource1.setOperType(operationType); + resource1.setStatus(RequestsDbConstant.Status.PROCESSING); + resource1.setStatusDescription("Waiting for start"); + + + dbAdapter.initResourceOperationStatus(serviceId, operationId, operationType, resourceTemplateUUIDs); + + ResourceOperationStatus actualResource = + dbAdapter.getResourceOperationStatus(serviceId, operationId, "template1"); + assertThat(actualResource, sameBeanAs(resource1)); + } + + @Test + public void updateResourceOperationStatus() throws MsoRequestsDbException { + TestAppender.events.clear(); + String resourceTemplateUUID = "template1"; + String serviceId = "serviceId"; + String operationId = "operationId"; + String operationType = "operationType"; + String resourceInstanceID = "resourceInstanceID"; + String jobId = "jobId"; + String status = RequestsDbConstant.Status.FINISHED; + String progress = "50"; + String errorCode = "errorCode"; + String statusDescription = "statusDescription"; + + + ResourceOperationStatus expectedResource = new ResourceOperationStatus(); + expectedResource.setOperationId(operationId); + expectedResource.setServiceId(serviceId); + expectedResource.setResourceTemplateUUID(resourceTemplateUUID); + expectedResource.setOperType(operationType); + expectedResource.setJobId(jobId); + expectedResource.setErrorCode(errorCode); + expectedResource.setStatus(RequestsDbConstant.Status.FINISHED); + expectedResource.setStatusDescription(statusDescription); + expectedResource.setProgress(progress); + expectedResource.setResourceInstanceID(resourceInstanceID); + + + dbAdapter.updateResourceOperationStatus(serviceId, operationId, resourceTemplateUUID, operationType, + resourceInstanceID, jobId, status, progress, errorCode, statusDescription); + + ResourceOperationStatus actualResource = + dbAdapter.getResourceOperationStatus(serviceId, operationId, "template1"); + assertThat(actualResource, sameBeanAs(expectedResource)); + + for (ILoggingEvent logEvent : TestAppender.events) + if (logEvent.getLoggerName().equals("org.onap.so.logging.cxf.interceptor.SOAPLoggingInInterceptor") + && logEvent.getMarker().getName().equals("ENTRY")) { + Map mdc = logEvent.getMDCPropertyMap(); assertNotNull(mdc.get(ONAPLogConstants.MDCs.INSTANCE_UUID)); assertNotNull(mdc.get(ONAPLogConstants.MDCs.REQUEST_ID)); assertNotNull(mdc.get(ONAPLogConstants.MDCs.INVOCATION_ID)); - assertEquals("",mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME)); - assertEquals("/services/RequestsDbAdapter",mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); - assertEquals("INPROGRESS",mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); - }else if(logEvent.getLoggerName().equals("org.onap.so.logging.cxf.interceptor.SOAPLoggingOutInterceptor") && - logEvent.getMarker().getName().equals("EXIT")){ - Map mdc = logEvent.getMDCPropertyMap(); + assertEquals("", mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME)); + assertEquals("/services/RequestsDbAdapter", mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); + assertEquals("INPROGRESS", mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); + } else if (logEvent.getLoggerName().equals("org.onap.so.logging.cxf.interceptor.SOAPLoggingOutInterceptor") + && logEvent.getMarker().getName().equals("EXIT")) { + Map mdc = logEvent.getMDCPropertyMap(); assertNotNull(mdc.get(ONAPLogConstants.MDCs.REQUEST_ID)); assertNotNull(mdc.get(ONAPLogConstants.MDCs.INVOCATION_ID)); - assertEquals(null,mdc.get(ONAPLogConstants.MDCs.RESPONSE_CODE)); - assertEquals("",mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME)); - assertEquals("/services/RequestsDbAdapter",mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); - assertEquals("COMPLETED",mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); + assertEquals(null, mdc.get(ONAPLogConstants.MDCs.RESPONSE_CODE)); + assertEquals("", mdc.get(ONAPLogConstants.MDCs.PARTNER_NAME)); + assertEquals("/services/RequestsDbAdapter", mdc.get(ONAPLogConstants.MDCs.SERVICE_NAME)); + assertEquals("COMPLETED", mdc.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE)); } - } + } } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/application/EmbeddedMariaDbConfig.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/application/EmbeddedMariaDbConfig.java index c1848e3aad..ad405984e3 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/application/EmbeddedMariaDbConfig.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/application/EmbeddedMariaDbConfig.java @@ -19,10 +19,10 @@ */ package org.onap.so.adapters.requestsdb.application; + import ch.vorburger.exec.ManagedProcessException; import ch.vorburger.mariadb4j.DBConfigurationBuilder; import ch.vorburger.mariadb4j.springframework.MariaDB4jSpringService; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.jdbc.DataSourceBuilder; @@ -37,17 +37,14 @@ import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; - import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; @Configuration @Profile({"test"}) @EnableTransactionManagement -@EnableJpaRepositories( - entityManagerFactoryRef = "requestEntityManagerFactory",transactionManagerRef = "requestTransactionManager", - basePackages = { "org.onap.so.db.request.data.repository"} - ) +@EnableJpaRepositories(entityManagerFactoryRef = "requestEntityManagerFactory", + transactionManagerRef = "requestTransactionManager", basePackages = {"org.onap.so.db.request.data.repository"}) public class EmbeddedMariaDbConfig { @Bean @@ -56,47 +53,34 @@ public class EmbeddedMariaDbConfig { } @Primary - @Bean(name = "requestDataSource") - @ConfigurationProperties(prefix = "spring.datasource") + @Bean(name = "requestDataSource") + @ConfigurationProperties(prefix = "spring.datasource") DataSource dataSource(MariaDB4jSpringService mariaDB4jSpringService, - @Value("${mariaDB4j.databaseName}") String databaseName, - @Value("${spring.datasource.username}") String datasourceUsername, - @Value("${spring.datasource.password}") String datasourcePassword, - @Value("${spring.datasource.driver-class-name}") String datasourceDriver) throws ManagedProcessException { - //Create our database with default root user and no password + @Value("${mariaDB4j.databaseName}") String databaseName, + @Value("${spring.datasource.username}") String datasourceUsername, + @Value("${spring.datasource.password}") String datasourcePassword, + @Value("${spring.datasource.driver-class-name}") String datasourceDriver) throws ManagedProcessException { + // Create our database with default root user and no password mariaDB4jSpringService.getDB().createDB(databaseName); DBConfigurationBuilder config = mariaDB4jSpringService.getConfiguration(); - return DataSourceBuilder - .create() - .username(datasourceUsername) - .password(datasourcePassword) - .url(config.getURL(databaseName)) - .driverClassName(datasourceDriver) - .build(); + return DataSourceBuilder.create().username(datasourceUsername).password(datasourcePassword) + .url(config.getURL(databaseName)).driverClassName(datasourceDriver).build(); } - @Primary - @Bean(name = "requestEntityManagerFactory") - public LocalContainerEntityManagerFactoryBean - entityManagerFactory( - EntityManagerFactoryBuilder builder, - @Qualifier("requestDataSource") DataSource dataSource - ) { - return builder - .dataSource(dataSource) - .packages("org.onap.so.db.request.beans") - .persistenceUnit("requestDB") - .build(); - } + @Primary + @Bean(name = "requestEntityManagerFactory") + public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, + @Qualifier("requestDataSource") DataSource dataSource) { + return builder.dataSource(dataSource).packages("org.onap.so.db.request.beans").persistenceUnit("requestDB") + .build(); + } - @Primary - @Bean(name = "requestTransactionManager") - public PlatformTransactionManager transactionManager( - @Qualifier("requestEntityManagerFactory") EntityManagerFactory - entityManagerFactory - ) { - return new JpaTransactionManager(entityManagerFactory); - } + @Primary + @Bean(name = "requestTransactionManager") + public PlatformTransactionManager transactionManager( + @Qualifier("requestEntityManagerFactory") EntityManagerFactory entityManagerFactory) { + return new JpaTransactionManager(entityManagerFactory); + } } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/application/TestAppender.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/application/TestAppender.java index 0da1fd7565..5607c12b83 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/application/TestAppender.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/application/TestAppender.java @@ -27,11 +27,11 @@ import ch.qos.logback.core.AppenderBase; -public class TestAppender extends AppenderBase { +public class TestAppender extends AppenderBase { public static List events = new ArrayList<>(); - - @Override - public void append(ILoggingEvent loggingEvent) { - events.add(loggingEvent); - } + + @Override + public void append(ILoggingEvent loggingEvent) { + events.add(loggingEvent); + } } diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestDbClientPortChanger.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestDbClientPortChanger.java index bd15396c03..1ccd44d384 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestDbClientPortChanger.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestDbClientPortChanger.java @@ -24,6 +24,7 @@ package org.onap.so.adapters.requestsdb.client; import org.onap.so.db.request.client.RequestsDbClient; import org.springframework.stereotype.Component; import java.net.URI; + @Component public class RequestDbClientPortChanger extends RequestsDbClient { private int port; diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java index 467cb1ed23..3b737c6768 100644 --- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java +++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/client/RequestsDbClientTest.java @@ -40,7 +40,6 @@ import java.util.UUID; import java.util.Map; import java.util.HashMap; import java.util.ArrayList; - import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -86,13 +85,14 @@ public class RequestsDbClientTest extends RequestsAdapterBase { infraActiveRequests.setRequestStatus("IN_PROGRESS"); infraActiveRequests.setAction("create"); infraActiveRequests.setRequestAction("someaction"); - infraActiveRequests.setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances"); + infraActiveRequests + .setRequestUrl("http://localhost:8080/onap/so/infra/serviceInstantiation/v7/serviceInstances"); requestsDbClient.save(infraActiveRequests); } - private void verifyOperationStatus(OperationStatus request,OperationStatus response){ + private void verifyOperationStatus(OperationStatus request, OperationStatus response) { assertThat(request, sameBeanAs(response).ignoring("operateAt").ignoring("finishedAt")); - } + } private void verifyInfraActiveRequests(InfraActiveRequests infraActiveRequestsResponse) { @@ -116,14 +116,16 @@ public class RequestsDbClientTest extends RequestsAdapterBase { @Test public void checkVnfIdStatusTest() { - InfraActiveRequests infraActiveRequestsResponse = requestsDbClient.checkVnfIdStatus(infraActiveRequests.getOperationalEnvId()); + InfraActiveRequests infraActiveRequestsResponse = + requestsDbClient.checkVnfIdStatus(infraActiveRequests.getOperationalEnvId()); verifyInfraActiveRequests(infraActiveRequestsResponse); assertNull(requestsDbClient.checkVnfIdStatus(UUID.randomUUID().toString())); } @Test public void checkInstanceNameDuplicateTest() { - InfraActiveRequests infraActiveRequestsResponse = requestsDbClient.checkInstanceNameDuplicate(null,infraActiveRequests.getOperationalEnvName(),infraActiveRequests.getRequestScope()); + InfraActiveRequests infraActiveRequestsResponse = requestsDbClient.checkInstanceNameDuplicate(null, + infraActiveRequests.getOperationalEnvName(), infraActiveRequests.getRequestScope()); verifyInfraActiveRequests(infraActiveRequestsResponse); } @@ -133,7 +135,8 @@ public class RequestsDbClientTest extends RequestsAdapterBase { Map requestMap = new HashMap<>(); requestMap.put("operationalEnvironmentId", infraActiveRequests.getOperationalEnvId()); - InfraActiveRequests infraActiveRequestsResponse = requestsDbClient.checkInstanceNameDuplicate((HashMap)requestMap,null,infraActiveRequests.getRequestScope()); + InfraActiveRequests infraActiveRequestsResponse = requestsDbClient.checkInstanceNameDuplicate( + (HashMap) requestMap, null, infraActiveRequests.getRequestScope()); verifyInfraActiveRequests(infraActiveRequestsResponse); } @@ -165,27 +168,30 @@ public class RequestsDbClientTest extends RequestsAdapterBase { } @Test - public void getInfraActiveRequestbyRequestIdTest(){ - InfraActiveRequests infraActiveRequestsResponse = requestsDbClient.getInfraActiveRequestbyRequestId(infraActiveRequests.getRequestId()); - verifyInfraActiveRequests(infraActiveRequestsResponse); - infraActiveRequestsResponse = requestsDbClient.getInfraActiveRequestbyRequestId(infraActiveRequests.getRequestId()); - + public void getInfraActiveRequestbyRequestIdTest() { + InfraActiveRequests infraActiveRequestsResponse = + requestsDbClient.getInfraActiveRequestbyRequestId(infraActiveRequests.getRequestId()); + verifyInfraActiveRequests(infraActiveRequestsResponse); + infraActiveRequestsResponse = + requestsDbClient.getInfraActiveRequestbyRequestId(infraActiveRequests.getRequestId()); + assertNull(requestsDbClient.getInfraActiveRequestbyRequestId(UUID.randomUUID().toString())); } - + @Test - public void getInfraActiveRequestbyRequestIdWhereRequestUrlNullTest(){ + public void getInfraActiveRequestbyRequestIdWhereRequestUrlNullTest() { // requestUrl setup to null and save - infraActiveRequests.setRequestUrl(null); + infraActiveRequests.setRequestUrl(null); requestsDbClient.save(infraActiveRequests); - InfraActiveRequests infraActiveRequestsResponse = requestsDbClient.getInfraActiveRequestbyRequestId(infraActiveRequests.getRequestId()); + InfraActiveRequests infraActiveRequestsResponse = + requestsDbClient.getInfraActiveRequestbyRequestId(infraActiveRequests.getRequestId()); verifyInfraActiveRequests(infraActiveRequestsResponse); assertNull(infraActiveRequestsResponse.getRequestUrl()); } - + @Test - public void getOneByServiceIdAndOperationIdTest(){ + public void getOneByServiceIdAndOperationIdTest() { OperationStatus operationStatus = new OperationStatus(); operationStatus.setProgress("IN_PROGRESS"); operationStatus.setResult("FAILED"); @@ -198,51 +204,59 @@ public class RequestsDbClientTest extends RequestsAdapterBase { operationStatus.setServiceName("test-service"); requestsDbClient.save(operationStatus); - OperationStatus operationStatusResponse = requestsDbClient.getOneByServiceIdAndOperationId(operationStatus.getServiceId(),operationStatus.getOperationId()); + OperationStatus operationStatusResponse = requestsDbClient + .getOneByServiceIdAndOperationId(operationStatus.getServiceId(), operationStatus.getOperationId()); - verifyOperationStatus(operationStatus,operationStatusResponse); + verifyOperationStatus(operationStatus, operationStatusResponse); - assertNull(requestsDbClient.getOneByServiceIdAndOperationId(UUID.randomUUID().toString(),operationStatus.getOperationId())); + assertNull(requestsDbClient.getOneByServiceIdAndOperationId(UUID.randomUUID().toString(), + operationStatus.getOperationId())); } @Test - public void getRequestProcessingDataBySoRequestIdTest(){ - List requestProcessingDataList = requestsDbClient - .getRequestProcessingDataBySoRequestId("00032ab7-na18-42e5-965d-8ea592502018"); + public void getRequestProcessingDataBySoRequestIdTest() { + List requestProcessingDataList = + requestsDbClient.getRequestProcessingDataBySoRequestId("00032ab7-na18-42e5-965d-8ea592502018"); assertNotNull(requestProcessingDataList); assertFalse(requestProcessingDataList.isEmpty()); - assertEquals(2,requestProcessingDataList.size()); + assertEquals(2, requestProcessingDataList.size()); } @Test - public void findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestIdTest(){ - OperationalEnvServiceModelStatus operationalEnvServiceModelStatus =requestsDbClient.findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId("1234","TEST1234", "00032ab7-3fb3-42e5-965d-8ea592502017"); + public void findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestIdTest() { + OperationalEnvServiceModelStatus operationalEnvServiceModelStatus = + requestsDbClient.findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId("1234", "TEST1234", + "00032ab7-3fb3-42e5-965d-8ea592502017"); assertNotNull(operationalEnvServiceModelStatus); - assertEquals("1234",operationalEnvServiceModelStatus.getOperationalEnvId()); - assertEquals("TEST1234",operationalEnvServiceModelStatus.getServiceModelVersionId()); - - OperationalEnvServiceModelStatus operationalEnvServiceModelStatus1 =requestsDbClient.findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId("1234","TEST1235", "00032ab7-3fb3-42e5-965d-8ea592502018"); + assertEquals("1234", operationalEnvServiceModelStatus.getOperationalEnvId()); + assertEquals("TEST1234", operationalEnvServiceModelStatus.getServiceModelVersionId()); + + OperationalEnvServiceModelStatus operationalEnvServiceModelStatus1 = + requestsDbClient.findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId("1234", "TEST1235", + "00032ab7-3fb3-42e5-965d-8ea592502018"); assertNotNull(operationalEnvServiceModelStatus1); - assertEquals("00032ab7-3fb3-42e5-965d-8ea592502018",operationalEnvServiceModelStatus1.getRequestId()); - assertEquals("1234",operationalEnvServiceModelStatus1.getOperationalEnvId()); - assertEquals("TEST1235",operationalEnvServiceModelStatus1.getServiceModelVersionId()); + assertEquals("00032ab7-3fb3-42e5-965d-8ea592502018", operationalEnvServiceModelStatus1.getRequestId()); + assertEquals("1234", operationalEnvServiceModelStatus1.getOperationalEnvId()); + assertEquals("TEST1235", operationalEnvServiceModelStatus1.getServiceModelVersionId()); } @Test - public void getAllByOperationalEnvIdAndRequestId(){ - List operationalEnvServiceModelStatuses =requestsDbClient.getAllByOperationalEnvIdAndRequestId("1234","00032ab7-3fb3-42e5-965d-8ea592502017"); + public void getAllByOperationalEnvIdAndRequestId() { + List operationalEnvServiceModelStatuses = + requestsDbClient.getAllByOperationalEnvIdAndRequestId("1234", "00032ab7-3fb3-42e5-965d-8ea592502017"); assertNotNull(operationalEnvServiceModelStatuses); assertFalse(operationalEnvServiceModelStatuses.isEmpty()); - assertEquals(2,operationalEnvServiceModelStatuses.size()); + assertEquals(2, operationalEnvServiceModelStatuses.size()); } @Test - public void getDistributionStatusByIdTest(){ - OperationalEnvDistributionStatus operationalEnvDistributionStatus =requestsDbClient.getDistributionStatusById("111"); + public void getDistributionStatusByIdTest() { + OperationalEnvDistributionStatus operationalEnvDistributionStatus = + requestsDbClient.getDistributionStatusById("111"); assertNotNull(operationalEnvDistributionStatus); - assertEquals("111",operationalEnvDistributionStatus.getDistributionId()); - assertEquals("ERROR",operationalEnvDistributionStatus.getDistributionIdErrorReason()); - assertEquals("00032ab7-3fb3-42e5-965d-8ea592502017",operationalEnvDistributionStatus.getRequestId()); + assertEquals("111", operationalEnvDistributionStatus.getDistributionId()); + assertEquals("ERROR", operationalEnvDistributionStatus.getDistributionIdErrorReason()); + assertEquals("00032ab7-3fb3-42e5-965d-8ea592502017", operationalEnvDistributionStatus.getRequestId()); } } -- cgit 1.2.3-korg