import static org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration.DELETESERVICEINSTANCE;
import static org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration.DELETEVNFINSTANCE;
+import static org.onap.sdnc.northbound.client.model.GenericResourceApiSvcActionEnumeration.DELETE;
import static org.onap.so.sdncsimulator.utils.Constants.OPERATIONS_URL;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.MediaType;
import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestinformationRequestInformation;
+import org.onap.sdnc.northbound.client.model.GenericResourceApiSdncrequestheaderSdncRequestHeader;
import org.onap.sdnc.northbound.client.model.GenericResourceApiServiceOperationInformation;
+import org.onap.sdnc.northbound.client.model.GenericResourceApiSvcActionEnumeration;
import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfOperationInformation;
import org.onap.so.sdncsimulator.models.InputRequest;
import org.onap.so.sdncsimulator.models.Output;
@Controller
@RequestMapping(path = OPERATIONS_URL)
public class OperationsController {
+ private static final String HTTP_STATUS_OK = HttpStatus.OK.value() + "";
private static final Logger LOGGER = LoggerFactory.getLogger(OperationsController.class);
final Output output = getOutput(apiServiceOperationInformation);
final OutputRequest outputRequest = new OutputRequest(output);
- if (output.getResponseCode().equals(HttpStatus.OK.toString())) {
+ if (output.getResponseCode().equals(HTTP_STATUS_OK)) {
LOGGER.info("Sucessfully executed service request sending response: {}", outputRequest);
return ResponseEntity.ok(outputRequest);
}
final Output output = getOutput(apiVnfOperationInformation);
final OutputRequest outputRequest = new OutputRequest(output);
- if (output.getResponseCode().equals(HttpStatus.OK.toString())) {
+ if (output.getResponseCode().equals(HTTP_STATUS_OK)) {
LOGGER.info("Sucessfully executed request vnf sending response: {}", outputRequest);
return ResponseEntity.ok(outputRequest);
}
private Output getOutput(final GenericResourceApiServiceOperationInformation serviceOperationInformation) {
final GenericResourceApiRequestinformationRequestInformation requestInformation =
serviceOperationInformation.getRequestInformation();
- if (requestInformation != null) {
+ final GenericResourceApiSdncrequestheaderSdncRequestHeader sdncRequestHeader =
+ serviceOperationInformation.getSdncRequestHeader();
+ if (requestInformation != null && sdncRequestHeader != null) {
final GenericResourceApiRequestActionEnumeration requestAction = requestInformation.getRequestAction();
- if (DELETESERVICEINSTANCE.equals(requestAction)) {
- LOGGER.info("RequestAction: {} will delete service instance from cache ...", requestAction);
+ final GenericResourceApiSvcActionEnumeration svcAction = sdncRequestHeader.getSvcAction();
+ if (DELETESERVICEINSTANCE.equals(requestAction) && DELETE.equals(svcAction)) {
+ LOGGER.info("RequestAction: {} and SvcAction: {} will delete service instance from cache ...",
+ requestAction, svcAction);
return cacheServiceProvider.deleteServiceOperationInformation(serviceOperationInformation);
}
}