import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
-import com.nokia.cbam.lcm.v32.ApiException;
import com.nokia.cbam.lcm.v32.api.OperationExecutionsApi;
import com.nokia.cbam.lcm.v32.api.VnfsApi;
import com.nokia.cbam.lcm.v32.model.OperationExecution;
+import com.nokia.cbam.lcm.v32.model.OperationType;
import com.nokia.cbam.lcm.v32.model.VnfInfo;
-import org.apache.http.HttpStatus;
+import java.util.*;
+import javax.servlet.http.HttpServletResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.core.SelfRegistrationManager;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.notification.LifecycleChangeNotificationManager;
import org.onap.vnfmdriver.model.JobDetailInfo;
import org.onap.vnfmdriver.model.JobDetailInfoResponseDescriptor;
import org.onap.vnfmdriver.model.JobResponseInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+import static java.util.Optional.empty;
+import static java.util.Optional.of;
import static com.google.common.base.Splitter.on;
+import static com.google.common.collect.Iterables.find;
import static com.google.common.collect.Iterables.tryFind;
import static com.google.common.collect.Lists.newArrayList;
-import static java.util.Optional.empty;
-import static java.util.Optional.of;
+import static com.nokia.cbam.lcm.v32.model.OperationStatus.FAILED;
+import static com.nokia.cbam.lcm.v32.model.OperationStatus.STARTED;
import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.SEPARATOR;
-import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.fatalFailure;
+import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.buildFatalFailure;
import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.SystemFunctions.systemFunctions;
import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.CbamRestApiProvider.NOKIA_LCM_API_VERSION;
+import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.notification.LifecycleChangeNotificationManager.NEWEST_OPERATIONS_FIRST;
import static org.slf4j.LoggerFactory.getLogger;
import static org.springframework.util.StringUtils.isEmpty;
return jobId.getAsString();
}
+ /**
+ * @return is the component preparing for shutdown
+ */
+ public boolean isPreparingForShutDown(){
+ return preparingForShutDown;
+ }
+
/**
* Throws an exception in case the service is not ready to serve requests due to
* not being able to register to MSB or to subscribe to CBAM LCNs
String jobId = vnfId + SEPARATOR + UUID.randomUUID().toString();
synchronized (this) {
if (preparingForShutDown) {
- response.setStatus(HttpStatus.SC_SERVICE_UNAVAILABLE);
- fatalFailure(logger, "The service is preparing to shut down");
+ response.setStatus(SC_SERVICE_UNAVAILABLE);
+ throw buildFatalFailure(logger, "The service is preparing to shut down");
}
if (!selfRegistrationManager.isReady()) {
- response.setStatus(HttpStatus.SC_SERVICE_UNAVAILABLE);
- fatalFailure(logger, "The service is not yet ready");
+ response.setStatus(SC_SERVICE_UNAVAILABLE);
+ throw buildFatalFailure(logger, "The service is not yet ready");
}
}
ongoingJobs.add(jobId);
OperationExecution operation = findOperationByJobId(vnfmId, vnf, jobId);
return getJobDetailInfo(vnfmId, jobId, vnfId, operation);
} catch (NoSuchElementException e) {
+ logger.warn("No operation could be identified for job with {} identifier", jobId, e);
if (ongoingJobs.contains(jobId)) {
return reportOngoing(jobId);
} else {
}
private JobDetailInfo getJobDetailInfo(String vnfmId, String jobId, String vnfId, OperationExecution operation) {
- switch (operation.getStatus()) {
- case STARTED:
+ if (operation.getStatus() == STARTED) {
+ return reportOngoing(jobId);
+ } else if (operation.getStatus() == FAILED) {
+ return reportFailed(jobId, operation.getError().getTitle() + ": " + operation.getError().getDetail());
+ } else {
+ return getJobForTerminalOperationState(vnfmId, jobId, vnfId, operation);
+ }
+ }
+
+ private JobDetailInfo getJobForTerminalOperationState(String vnfmId, String jobId, String vnfId, OperationExecution operation) {
+ //termination includes VNF deletion in ONAP terminology
+ if (operation.getOperationType() == com.nokia.cbam.lcm.v32.model.OperationType.TERMINATE) {
+ if (ongoingJobs.contains(jobId)) {
return reportOngoing(jobId);
- case FINISHED:
- case OTHER:
- //termination includes VNF deletion in ONAP terminology
- if (operation.getOperationType() == com.nokia.cbam.lcm.v32.model.OperationType.TERMINATE) {
- if (ongoingJobs.contains(jobId)) {
- return reportOngoing(jobId);
- } else {
- //the VNF must be queried again since it could have been deleted since the VNF has been terminated
- if (getVnf(vnfmId, vnfId).isPresent()) {
- return reportFailed(jobId, "unable to delete VNF");
- } else {
- return reportFinished(jobId);
- }
- }
+ } else {
+ //the VNF must be queried again since it could have been deleted since the VNF has been terminated
+ if (getVnf(vnfmId, vnfId).isPresent()) {
+ return reportFailed(jobId, "unable to delete VNF");
} else {
return reportFinished(jobId);
}
- case FAILED:
- default: //all cases handled
- return reportFailed(jobId, operation.getError().getTitle() + ": " + operation.getError().getDetail());
+ }
+ } else {
+ return reportFinished(jobId);
}
}
//the operations are sorted so that the newest operations are queried first
//performance optimization that usually the core system is interested in the operations executed last
if (vnf.getOperationExecutions() != null) {
- for (OperationExecution operationExecution : LifecycleChangeNotificationManager.NEWEST_OPERATIONS_FIRST.sortedCopy(vnf.getOperationExecutions())) {
- try {
- Object operationParams = cbamOperationExecutionApi.operationExecutionsOperationExecutionIdOperationParamsGet(operationExecution.getId(), NOKIA_LCM_API_VERSION);
- if (extractOnapJobId(operationParams).equals(jobId)) {
- return operationExecution;
- }
- } catch (ApiException e) {
- fatalFailure(logger, "Unable to retrieve operation parameters", e);
- }
- }
+ List<OperationExecution> sortedOperation = NEWEST_OPERATIONS_FIRST.sortedCopy(vnf.getOperationExecutions());
+ return find(sortedOperation, operation -> isCurrentOperationTriggeredByJob(jobId, cbamOperationExecutionApi, operation));
}
throw new NoSuchElementException();
}
+ private boolean isCurrentOperationTriggeredByJob(String jobId, OperationExecutionsApi cbamOperationExecutionApi, OperationExecution operationExecution) {
+ if (OperationType.MODIFY_INFO.equals(operationExecution.getOperationType())) {
+ //the modify info is never triggered by an external job
+ return false;
+ }
+ try {
+ Object operationParams = cbamOperationExecutionApi.operationExecutionsOperationExecutionIdOperationParamsGet(operationExecution.getId(), NOKIA_LCM_API_VERSION).blockingFirst();
+ if (extractOnapJobId(operationParams).equals(jobId)) {
+ return true;
+ }
+ } catch (Exception e) {
+ throw buildFatalFailure(logger, "Unable to retrieve operation parameters of operation with " + operationExecution.getId() + " identifier", e);
+ }
+ return false;
+ }
+
private Optional<VnfInfo> getVnf(String vnfmId, String vnfId) {
try {
//test if the VNF exists (required to be able to distingush between failed request )
VnfsApi cbamLcmApi = cbamRestApiProvider.getCbamLcmApi(vnfmId);
logger.debug("Listing VNFs");
- List<VnfInfo> vnfs = cbamLcmApi.vnfsGet(NOKIA_LCM_API_VERSION);
+ List<VnfInfo> vnfs = cbamLcmApi.vnfsGet(NOKIA_LCM_API_VERSION).blockingSingle();
com.google.common.base.Optional<VnfInfo> vnf = tryFind(vnfs, vnfInfo -> vnfId.equals(vnfInfo.getId()));
if (!vnf.isPresent()) {
logger.debug("VNF with {} identifier is missing", vnfId);
} else {
logger.debug("VNF with {} identifier still exists", vnfId);
//query the VNF again to get operation execution result
- return of(cbamLcmApi.vnfsVnfInstanceIdGet(vnfId, NOKIA_LCM_API_VERSION));
+ return of(cbamLcmApi.vnfsVnfInstanceIdGet(vnfId, NOKIA_LCM_API_VERSION).blockingFirst());
}
- } catch (ApiException e) {
- throw fatalFailure(logger, "Unable to retrieve VNF", e);
+ } catch (Exception e) {
+ throw buildFatalFailure(logger, "Unable to retrieve VNF with " + vnfId + " identifier", e);
}
}
}
Code Review / vfc / nfvo / driver / vnfm / svnfm.git / blobdiff