diff options
Diffstat (limited to 'mso-api-handlers')
7 files changed, 85 insertions, 34 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java index b09d676b57..7ed60384a5 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java @@ -403,7 +403,7 @@ public class E2EServiceInstances { msoRequest.createErrorRequestRecord(Status.FAILED, requestId, "Exception while communciate with " + "Catalog DB", action, ModelType.service.name(), requestJSON, - null); + null, null); logger.debug(END_OF_THE_TRANSACTION + response.getEntity()); return response; } @@ -415,7 +415,7 @@ public class E2EServiceInstances { ErrorNumbers.SVC_GENERAL_SERVICE_ERROR, null, version); msoRequest.createErrorRequestRecord(Status.FAILED, requestId, "Recipe does not exist in catalog DB", action, - ModelType.service.name(), requestJSON, null); + ModelType.service.name(), requestJSON, null, null); logger.debug(END_OF_THE_TRANSACTION + response.getEntity()); return response; } @@ -493,7 +493,7 @@ public class E2EServiceInstances { msoRequest.createErrorRequestRecord(Status.FAILED, requestId, "Exception while communciate with " + "Catalog DB", action, ModelType.service.name(), requestJSON, - null); + null, null); logger.debug(END_OF_THE_TRANSACTION + response.getEntity()); return response; } @@ -505,7 +505,7 @@ public class E2EServiceInstances { ErrorNumbers.SVC_GENERAL_SERVICE_ERROR, null, version); msoRequest.createErrorRequestRecord(Status.FAILED, requestId, "Recipe does not exist in catalog DB", action, - ModelType.service.name(), requestJSON, null); + ModelType.service.name(), requestJSON, null, null); logger.debug(END_OF_THE_TRANSACTION + response.getEntity()); return response; } @@ -725,7 +725,7 @@ public class E2EServiceInstances { msoRequest.createErrorRequestRecord(Status.FAILED, requestId, "No communication to catalog DB " + e.getMessage(), action, ModelType.service.name(), requestJSON, - null); + null, null); logger.debug(END_OF_THE_TRANSACTION + response.getEntity()); return response; } @@ -737,7 +737,7 @@ public class E2EServiceInstances { MsoException.ServiceException, "Recipe does not exist in catalog DB", ErrorNumbers.SVC_GENERAL_SERVICE_ERROR, null, version); msoRequest.createErrorRequestRecord(Status.FAILED, requestId, "No recipe found in DB", action, - ModelType.service.name(), requestJSON, null); + ModelType.service.name(), requestJSON, null, null); logger.debug(END_OF_THE_TRANSACTION + response.getEntity()); return response; } @@ -958,7 +958,7 @@ public class E2EServiceInstances { ErrorNumbers.SVC_BAD_PARAMETER).cause(e).errorInfo(errorLoggerInfo).build(); msoRequest.createErrorRequestRecord(Status.FAILED, requestId, validateException.getMessage(), action, - ModelType.service.name(), requestJSON, null); + ModelType.service.name(), requestJSON, null, null); throw validateException; } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java index bf76cd3174..64c42a0498 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java @@ -451,7 +451,7 @@ public class MsoRequest { } public void createErrorRequestRecord(Status status, String requestId, String errorMessage, Actions action, - String requestScope, String requestJSON, String serviceInstanceId) { + String requestScope, String requestJSON, String serviceInstanceId, ServiceInstancesRequest sir) { try { InfraActiveRequests request = new InfraActiveRequests(requestId); Timestamp startTimeStamp = new Timestamp(System.currentTimeMillis()); @@ -469,6 +469,17 @@ public class MsoRequest { Timestamp endTimeStamp = new Timestamp(System.currentTimeMillis()); request.setEndTime(endTimeStamp); request.setRequestUrl(MDC.get(LogConstants.HTTP_URL)); + if (sir != null) { + if (sir.getRequestDetails() != null && sir.getRequestDetails().getRequestInfo() != null) { + request.setRequestorId(sir.getRequestDetails().getRequestInfo().getRequestorId()); + request.setSource(sir.getRequestDetails().getRequestInfo().getSource()); + if (ModelType.service.name().equalsIgnoreCase(requestScope)) { + if (sir.getRequestDetails().getRequestInfo().getInstanceName() != null) { + request.setServiceInstanceName(sir.getRequestDetails().getRequestInfo().getInstanceName()); + } + } + } + } requestsDbClient.save(request); } catch (Exception e) { logger.error("Exception when updating record in DB", e); @@ -476,7 +487,6 @@ public class MsoRequest { } } - public Response buildResponse(int httpResponseCode, String errorCode, InfraActiveRequests inProgress) { return buildResponseWithError(httpResponseCode, errorCode, inProgress, null); } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java index 3f05c79dad..b1486c9686 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java @@ -88,9 +88,9 @@ import org.onap.so.db.request.beans.InfraActiveRequests; import org.onap.so.db.request.client.RequestsDbClient; @Component -@Path("/onap/so/infra/onap3gppServiceInstances") -@OpenAPIDefinition(info = @Info(title = "/onap/so/infra/onap3gppServiceInstances", - description = "API Requests for 3GPP Service Instances")) +@Path("/onap/so/infra/3gppservices") +@OpenAPIDefinition( + info = @Info(title = "/onap/so/infra/3gppservices", description = "API Requests for 3GPP Service Instances")) public class Onap3gppServiceInstances { private static final Logger logger = LoggerFactory.getLogger(Onap3gppServiceInstances.class); @@ -101,7 +101,7 @@ public class Onap3gppServiceInstances { private static final String SAVE_TO_DB = "save instance to db"; - private static String uriPrefix = "/onap3gppServiceInstances/"; + private static final String URI_PREFIX = "/3gppservices/"; @Autowired private MsoRequest msoRequest; @@ -140,7 +140,7 @@ public class Onap3gppServiceInstances { @Context ContainerRequestContext requestContext) throws ApiException { String requestId = requestHandlerUtils.getRequestId(requestContext); return processServiceInstanceRequest(request, Action.createInstance, version, requestId, null, - requestHandlerUtils.getRequestUri(requestContext, uriPrefix)); + requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX)); } /** @@ -161,7 +161,7 @@ public class Onap3gppServiceInstances { HashMap<String, String> instanceIdMap = new HashMap<>(); instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID()); return updateServiceInstances(request, Action.updateInstance, version, requestId, instanceIdMap, - requestHandlerUtils.getRequestUri(requestContext, uriPrefix)); + requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX)); } /** @@ -183,7 +183,7 @@ public class Onap3gppServiceInstances { HashMap<String, String> instanceIdMap = new HashMap<>(); instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID()); return deleteServiceInstances(request, Action.deleteInstance, version, requestId, instanceIdMap, - requestHandlerUtils.getRequestUri(requestContext, uriPrefix)); + requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX)); } /** @@ -204,7 +204,7 @@ public class Onap3gppServiceInstances { HashMap<String, String> instanceIdMap = new HashMap<>(); instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID()); return activateOrDeactivateServiceInstances(request, Action.activateInstance, version, requestId, instanceIdMap, - requestHandlerUtils.getRequestUri(requestContext, uriPrefix)); + requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX)); } /** @@ -225,7 +225,7 @@ public class Onap3gppServiceInstances { HashMap<String, String> instanceIdMap = new HashMap<>(); instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID()); return activateOrDeactivateServiceInstances(request, Action.deactivateInstance, version, requestId, - instanceIdMap, requestHandlerUtils.getRequestUri(requestContext, uriPrefix)); + instanceIdMap, requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX)); } /** diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java index 60e9c3b30a..cddb1ada31 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java @@ -326,7 +326,7 @@ public class RequestHandlerUtils extends AbstractRestHandler { String requestScope = requestScopeFromUri(requestUri); msoRequest.createErrorRequestRecord(Status.FAILED, requestId, validateException.getMessage(), action, - requestScope, requestJSON, null); + requestScope, requestJSON, null, null); throw validateException; } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java index 2c8e92633c..7924ca304a 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java @@ -830,7 +830,8 @@ public class ServiceInstances extends AbstractRestHandler { } catch (ApiException e) { msoRequest.createErrorRequestRecord(Status.FAILED, requestId, e.getMessage(), action, requestScope, requestJSON, requestHandlerUtils - .getServiceInstanceIdForValidationError(sir, instanceIdMap, requestScope).orElse(null)); + .getServiceInstanceIdForValidationError(sir, instanceIdMap, requestScope).orElse(null), + sir); throw e; } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java index c3c92be013..95f00c3a39 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java @@ -55,9 +55,9 @@ import org.springframework.beans.factory.annotation.Autowired; public class Onap3gppServiceInstancesTest extends BaseTest { - private String onap3gppServicesUri = "/onap/so/infra/onap3gppServiceInstances/"; + private static final String ONAP3GPPSERVICES_URI = "/onap/so/infra/3gppservices/"; - private final ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper MAPPER = new ObjectMapper(); @Autowired private Onap3gppServiceInstances objUnderTest; @@ -74,11 +74,11 @@ public class Onap3gppServiceInstancesTest extends BaseTest { wireMockServer.stubFor(get(urlPathEqualTo("/service/search/findFirstByModelNameOrderByModelVersionDesc")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) - .withBody(mapper.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK))); + .withBody(MAPPER.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK))); wireMockServer.stubFor(get(urlPathEqualTo("/serviceRecipe/search/findFirstByServiceModelUUIDAndAction")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) - .withBody(mapper.writeValueAsString(serviceRecipe)).withStatus(HttpStatus.SC_OK))); + .withBody(MAPPER.writeValueAsString(serviceRecipe)).withStatus(HttpStatus.SC_OK))); wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/")).willReturn(aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON).withStatus(HttpStatus.SC_OK))); Mockito.doReturn(null).when(requestsDbClient).getInfraActiveRequestbyRequestId(Mockito.any()); @@ -107,7 +107,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest { @Test public void createServiceInstanceTest() throws IOException { - String uri = onap3gppServicesUri + "v1/allocate"; + String uri = ONAP3GPPSERVICES_URI + "v1/allocate"; wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn( aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json") .withStatus(org.apache.http.HttpStatus.SC_ACCEPTED))); @@ -123,7 +123,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest { @Test public void updateServiceInstanceTest() throws IOException { - String uri = onap3gppServicesUri + "v1/modify"; + String uri = ONAP3GPPSERVICES_URI + "v1/modify"; wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn( aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json") .withStatus(org.apache.http.HttpStatus.SC_ACCEPTED))); @@ -139,7 +139,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest { @Test public void deleteServiceInstanceTest() throws IOException { - String uri = onap3gppServicesUri + "v1/deAllocate"; + String uri = ONAP3GPPSERVICES_URI + "v1/deAllocate"; wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn( aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json") .withStatus(org.apache.http.HttpStatus.SC_ACCEPTED))); @@ -154,7 +154,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest { @Test public void activateServiceInstanceTest() throws IOException { - String uri = onap3gppServicesUri + "v1/activate"; + String uri = ONAP3GPPSERVICES_URI + "v1/activate"; wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn( aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json") .withStatus(org.apache.http.HttpStatus.SC_ACCEPTED))); @@ -169,7 +169,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest { @Test public void deActivateServiceInstance() throws IOException { - String uri = onap3gppServicesUri + "v1/deActivate"; + String uri = ONAP3GPPSERVICES_URI + "v1/deActivate"; wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn( aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json") .withStatus(org.apache.http.HttpStatus.SC_ACCEPTED))); @@ -185,7 +185,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest { @Test public void getSliceSubnetCapabilitiesTest() throws IOException, ApiException { String request = "{\"subnetTypes\":[\"AN\"]}"; - QuerySubnetCapability subnetCapabilityRequest = mapper.readValue(request, QuerySubnetCapability.class); + QuerySubnetCapability subnetCapabilityRequest = MAPPER.readValue(request, QuerySubnetCapability.class); String expectedResponse = "{\"AN\":{\"latency\":\"5\",\"maxNumberofUEs\":\"100\",\"maxThroughput\":\"150\",\"terminalDensity\":\"50\"}}"; Response response = objUnderTest.getSliceSubnetCapabilities(subnetCapabilityRequest, "v1"); diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/client/RequestsDbClient.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/client/RequestsDbClient.java index 17b22ec216..9b42eacfc2 100644 --- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/client/RequestsDbClient.java +++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/client/RequestsDbClient.java @@ -29,6 +29,7 @@ import javax.annotation.PostConstruct; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriBuilder; import org.apache.http.HttpStatus; +import org.onap.logging.filter.spring.SpringClientPayloadFilter; import org.onap.so.db.request.beans.ArchivedInfraRequests; import org.onap.so.db.request.beans.InfraActiveRequests; import org.onap.so.db.request.beans.OperationStatus; @@ -42,6 +43,7 @@ import org.onap.so.db.request.beans.WatchdogComponentDistributionStatus; import org.onap.so.db.request.beans.WatchdogDistributionStatus; import org.onap.so.db.request.beans.WatchdogServiceModVerIdLookup; import org.onap.so.db.request.data.controller.InstanceNameDuplicateCheckRequest; +import org.onap.so.logging.jaxrs.filter.SOSpringClientFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Primary; @@ -297,17 +299,55 @@ public class RequestsDbClient { restTemplate.exchange(uri, HttpMethod.PATCH, entity, String.class); } + /** + * Required for groovy usage. Cannot use Spring Autowired variables + * + * @param requestId + * @param basicAuth + * @param host + * @return + */ public InfraActiveRequests getInfraActiveRequests(String requestId, String basicAuth, String host) { + RestTemplate template = new RestTemplate(); + HttpHeaders headers = new HttpHeaders(); + headers.set(HttpHeaders.AUTHORIZATION, basicAuth); + headers.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON); + headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON); URI uri = getUri(host + "/infraActiveRequests/" + requestId); - - return getSingleResponse(uri, InfraActiveRequests.class); + try { + InfraActiveRequests infraActiveRequests = template + .exchange(uri, HttpMethod.GET, new HttpEntity<>(headers), InfraActiveRequests.class).getBody(); + if (infraActiveRequests != null) { + infraActiveRequests.setRequestId(requestId); + } + return infraActiveRequests; + } catch (HttpClientErrorException e) { + if (HttpStatus.SC_NOT_FOUND == e.getStatusCode().value()) { + return null; + } + throw e; + } } + /** + * Required for groovy usage. Cannot use Spring Autowired variables + * + * @param request + * @param basicAuth + * @param host + */ public void updateInfraActiveRequests(InfraActiveRequests request, String basicAuth, String host) { + RestTemplate template = new RestTemplate(); + template.getInterceptors().add(new SOSpringClientFilter()); + template.getInterceptors().add(new SpringClientPayloadFilter()); + HttpHeaders headers = new HttpHeaders(); + headers.set(HttpHeaders.AUTHORIZATION, basicAuth); + headers.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON); + headers.set(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON); URI uri = getUri(host + "/infraActiveRequests/" + request.getRequestId()); - HttpEntity<InfraActiveRequests> entity = new HttpEntity<>(request, getHttpHeaders()); - restTemplate.put(uri, entity); + HttpEntity<InfraActiveRequests> entity = new HttpEntity<>(request, headers); + template.put(uri, entity); } protected URI getUri(String uri) { |