import org.onap.clamp.clds.client.req.sdc.SdcCatalogServices;
import org.onap.clamp.clds.config.ClampProperties;
import org.onap.clamp.clds.dao.CldsDao;
-import org.onap.clamp.clds.exception.CldsConfigException;
import org.onap.clamp.clds.exception.policy.PolicyClientException;
import org.onap.clamp.clds.exception.sdc.SdcCommunicationException;
import org.onap.clamp.clds.model.CldsDbServiceCache;
import org.onap.clamp.clds.model.ValueItem;
import org.onap.clamp.clds.model.properties.AbstractModelElement;
import org.onap.clamp.clds.model.properties.ModelProperties;
-import org.onap.clamp.clds.model.sdc.SdcResource;
-import org.onap.clamp.clds.model.sdc.SdcServiceDetail;
import org.onap.clamp.clds.model.sdc.SdcServiceInfo;
import org.onap.clamp.clds.sdc.controller.installer.CsarInstallerImpl;
import org.onap.clamp.clds.transform.XslTransformer;
final SecureServicePermission permissionUpdateCl;
final SecureServicePermission permissionReadTemplate;
final SecureServicePermission permissionUpdateTemplate;
+ final SecureServicePermission permissionReadTosca;
+ final SecureServicePermission permissionUpdateTosca;
private final CldsDao cldsDao;
private final XslTransformer cldsBpmnTransformer;
@Autowired
private HttpServletRequest request;
+
@Autowired
public CldsService(CldsDao cldsDao, XslTransformer cldsBpmnTransformer, ClampProperties refProp,
SdcCatalogServices sdcCatalogServices, DcaeDispatcherServices dcaeDispatcherServices,
@Value("${clamp.config.security.permission.type.cl.event:permission-type-cl-event}") String cldsPermissionTypeClEvent,
@Value("${clamp.config.security.permission.type.filter.vf:permission-type-filter-vf}") String cldsPermissionTypeFilterVf,
@Value("${clamp.config.security.permission.type.template:permission-type-template}") String cldsPermissionTypeTemplate,
+ @Value("${clamp.config.security.permission.type.tosca:permission-type-tosca}") String cldsPermissionTypeTosca,
@Value("${clamp.config.security.permission.instance:dev}") String cldsPermissionInstance) {
this.cldsDao = cldsDao;
this.cldsBpmnTransformer = cldsBpmnTransformer;
"read");
permissionUpdateTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance,
"update");
+ permissionReadTosca = SecureServicePermission.create(cldsPermissionTypeTosca, cldsPermissionInstance, "read");
+ permissionUpdateTosca = SecureServicePermission.create(cldsPermissionTypeTosca, cldsPermissionInstance,
+ "update");
}
/*
* used to generate the ClosedLoop model. ACTION_CD | Current state of the
* ClosedLoop in CLDS application.
*/
- public List<CldsMonitoringDetails> getCLDSDetails() {
+ public List<CldsMonitoringDetails> getCldsDetails() {
util.entering(request, "CldsService: GET model details");
Date startTime = new Date();
List<CldsMonitoringDetails> cldsMonitoringDetailsList = cldsDao.getCLDSMonitoringDetails();
* @return image xml text - content of image given name
*/
public String getImageXml(String modelName) {
- util.entering(request, "CldsService: GET model image");
+ util.entering(request, "CldsService: GET model image");
Date startTime = new Date();
isAuthorized(permissionReadCl);
logger.info("GET imageText for modelName={}", modelName);
* @return clds model - clds model for the given model name
*/
public CldsModel getModel(String modelName) {
- util.entering(request, "CldsService: GET model");
+ util.entering(request, "CldsService: GET model");
Date startTime = new Date();
isAuthorized(permissionReadCl);
logger.debug("GET model for modelName={}", modelName);
CldsModel cldsModel = CldsModel.retrieve(cldsDao, modelName, false);
isAuthorizedForVf(cldsModel);
+ // Try an update for DCAE status
// Checking condition whether our CLDS model can call Inventory Method
- if (cldsModel.canInventoryCall()) {
- try {
- // Method to call dcae inventory and invoke insert event method
+ try {
+ // Method to call dcae inventory and invoke insert event method
+ if (cldsModel.canDcaeInventoryCall()
+ && !cldsModel.getTemplateName().startsWith(CsarInstallerImpl.TEMPLATE_NAME_PREFIX)) {
dcaeInventoryServices.setEventInventory(cldsModel, getUserId());
- } catch (Exception e) {
- LoggingUtils.setErrorContext("900", "Set event inventory error");
- logger.error("getModel set event Inventory error:" + e);
}
+ // This is a blocking call
+ if (cldsModel.getEvent().isActionCd(CldsEvent.ACTION_DEPLOY)
+ && !CldsModel.STATUS_ACTIVE.equals(cldsModel.getStatus()) && cldsModel.getDeploymentId() != null
+ && cldsModel.getDeploymentStatusUrl() != null) {
+ checkDcaeDeploymentStatus(cldsModel, CldsEvent.ACTION_DEPLOY, false);
+ // Refresh the model object in any cases for new event
+ cldsModel = CldsModel.retrieve(cldsDao, cldsModel.getName(), false);
+ }
+ } catch (Exception e) {
+ LoggingUtils.setErrorContext("900", "Set event inventory error");
+ logger.error("getModel set event Inventory error:" + e);
}
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
* @param modelName
*/
public CldsModel putModel(String modelName, CldsModel cldsModel) {
- util.entering(request, "CldsService: PUT model");
+ util.entering(request, "CldsService: PUT model");
Date startTime = new Date();
isAuthorized(permissionUpdateCl);
isAuthorizedForVf(cldsModel);
logger.info("PUT bpmnText={}", cldsModel.getBpmnText());
logger.info("PUT propText={}", cldsModel.getPropText());
logger.info("PUT imageText={}", cldsModel.getImageText());
- cldsModel.setName(modelName);
fillInCldsModel(cldsModel);
- updateAndInsertNewEvent(cldsModel.getName(), cldsModel.getControlNamePrefix(), cldsModel.getEvent(),
- CldsEvent.ACTION_MODIFY);
cldsModel.save(cldsDao, getUserId());
+
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
auditLogger.info("PUT model completed");
Date startTime = new Date();
isAuthorized(permissionReadCl);
logger.info("GET list of model names");
- List<ValueItem> names = cldsDao.getBpmnNames();
+ List<ValueItem> names = cldsDao.getModelNames();
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
auditLogger.info("GET model names completed");
* @throws DecoderException
* In case of issues with the Hex String decoding
*/
- public ResponseEntity<?> putModelAndProcessAction(String action,
- String modelName,String test, CldsModel model)
- throws TransformerException, ParseException {
+ public ResponseEntity<?> putModelAndProcessAction(String action, String modelName, String test, CldsModel model)
+ throws TransformerException, ParseException {
util.entering(request, "CldsService: Process model action");
Date startTime = new Date();
- CldsModel retrievedModel = null;
- Boolean errorCase = false;
+ String errorMessage = "";
+ String actionCd = "";
try {
- String actionCd = action.toUpperCase();
+ actionCd = action.toUpperCase();
SecureServicePermission permisionManage = SecureServicePermission.create(cldsPermissionTypeClManage,
cldsPermissionInstance, actionCd);
isAuthorized(permisionManage);
logger.info("PUT getTypeId={}", model.getTypeId());
logger.info("PUT deploymentId={}", model.getDeploymentId());
this.fillInCldsModel(model);
- // save model to db
- model.setName(modelName);
- updateAndInsertNewEvent(modelName, model.getControlNamePrefix(), model.getEvent(), CldsEvent.ACTION_MODIFY);
+ // save model to db just in case
model.save(cldsDao, getUserId());
+
// get vars and format if necessary
String prop = model.getPropText();
String bpmn = model.getBpmnText();
String controlName = model.getControlName();
String bpmnJson = cldsBpmnTransformer.doXslTransformToString(bpmn);
logger.info("PUT bpmnJson={}", bpmnJson);
- // Flag indicates whether it is triggered by Validation Test button
- // from
- // UI
- boolean isTest = Boolean.valueOf(test);
- if (!isTest) {
- String actionTestOverride = refProp.getStringValue("action.test.override");
- if (Boolean.valueOf(actionTestOverride)) {
- logger.info("PUT actionTestOverride={}", actionTestOverride);
- logger.info("PUT override test indicator and setting it to true");
- isTest = true;
- }
- }
+ // Test flag coming from UI or from Clamp config
+ boolean isTest = Boolean.parseBoolean(test)
+ || Boolean.parseBoolean(refProp.getStringValue("action.test.override"));
logger.info("PUT isTest={}", isTest);
- String insertTestEvent = refProp.getStringValue("action.insert.test.event");
- boolean isInsertTestEvent = Boolean.valueOf(insertTestEvent);
-
+ boolean isInsertTestEvent = Boolean.parseBoolean(refProp.getStringValue("action.insert.test.event"));
logger.info("PUT isInsertTestEvent={}", isInsertTestEvent);
// determine if requested action is permitted
model.validateAction(actionCd);
logger.info("modelProp - " + prop);
logger.info("docText - " + docText);
try {
- String result = camelProxy.submit(actionCd, prop, bpmnJson, modelName, controlName, docText, isTest,
- userId, isInsertTestEvent, model.getEvent().getActionCd());
+ String result = camelProxy.executeAction(actionCd, prop, bpmnJson, modelName, controlName, docText,
+ isTest, userId, isInsertTestEvent, model.getEvent().getActionCd());
logger.info("Starting Camel flow on request, result is: ", result);
} catch (SdcCommunicationException | PolicyClientException | BadRequestException e) {
- errorCase = true;
logger.error("Exception occured during invoking Camel process", e);
+ errorMessage = e.getMessage();
}
- if (!actionCd.equalsIgnoreCase(CldsEvent.ACTION_DELETE)) {
- // refresh model info from db (get fresh event info)
- retrievedModel = CldsModel.retrieve(cldsDao, modelName, false);
- }
- if (retrievedModel != null) {
- if (!isTest && (actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMIT)
- || actionCd.equalsIgnoreCase(CldsEvent.ACTION_RESUBMIT)
- || actionCd.equalsIgnoreCase(CldsEvent.ACTION_SUBMITDCAE))) {
- if (retrievedModel.getTemplateName().startsWith(CsarInstallerImpl.TEMPLATE_NAME_PREFIX)) {
- // SDC artifact case
- logger.info("Skipping DCAE inventory call as closed loop has been created from SDC notification");
- DcaeEvent dcaeEvent = new DcaeEvent();
- dcaeEvent.setArtifactName(retrievedModel.getControlName() + ".yml");
- dcaeEvent.setEvent(DcaeEvent.EVENT_DISTRIBUTION);
- CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userId, dcaeEvent.getCldsActionCd(),
- CldsEvent.ACTION_STATE_RECEIVED, null);
- } else {
- // This should be done only when the call to DCAE
- // has not yet been done. When CL comes from SDC
- // this is not required as the DCAE inventory call is done
- // during the CL deployment.
- dcaeInventoryServices.setEventInventory(retrievedModel, getUserId());
- }
- retrievedModel.save(cldsDao, getUserId());
- }
- // audit log
- LoggingUtils.setTimeContext(startTime, new Date());
- auditLogger.info("Process model action completed");
- } else {
- logger.error("CldsModel not found in database with modelName: " + modelName);
- util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "CldsModel not found in database with modelName " + "modelName", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
- return new ResponseEntity<String>("CldsModel not found in database with modelName: \" + modelName", HttpStatus.INTERNAL_SERVER_ERROR);
- }
+ // audit log
+ LoggingUtils.setTimeContext(startTime, new Date());
+ auditLogger.info("Process model action completed");
} catch (Exception e) {
- errorCase = true;
logger.error("Exception occured during putModelAndProcessAction", e);
+ errorMessage = e.getMessage();
}
- if (errorCase) {
- util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "putModelAndProcessAction failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
- return new ResponseEntity<>(retrievedModel, HttpStatus.INTERNAL_SERVER_ERROR);
+
+ if (!errorMessage.isEmpty()) {
+ CldsEvent.insEvent(cldsDao, model.getControlName(), getUserId(), actionCd, CldsEvent.ACTION_STATE_ERROR,
+ null);
+ // Need a refresh as new events have been inserted
+ model = CldsModel.retrieve(cldsDao, modelName, false);
+ model.setErrorMessageForUi(errorMessage);
+ util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "putModelAndProcessAction failed", Level.INFO,
+ ONAPLogConstants.ResponseStatus.ERROR);
+ return new ResponseEntity<>(model, HttpStatus.INTERNAL_SERVER_ERROR);
+ } else {
+ // Need a refresh as new events have been inserted, could have been deleted so
+ // not blocking call
+ model = CldsModel.retrieve(cldsDao, modelName, true);
+ util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+ return new ResponseEntity<>(model, HttpStatus.OK);
}
- util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
- return new ResponseEntity<>(retrievedModel, HttpStatus.OK);
}
/**
}
// Flag indicates whether it is triggered by Validation Test button from
// UI
- boolean isTest = Boolean.valueOf(test);
+ boolean isTest = Boolean.parseBoolean(test);
int instanceCount = 0;
if (dcaeEvent.getInstances() != null) {
instanceCount = dcaeEvent.getInstances().size();
}
String msgInfo = "event=" + dcaeEvent.getEvent() + " serviceUUID=" + dcaeEvent.getServiceUUID()
- + " resourceUUID=" + dcaeEvent.getResourceUUID() + " artifactName=" + dcaeEvent.getArtifactName()
- + " instance count=" + instanceCount + " isTest=" + isTest;
+ + " resourceUUID=" + dcaeEvent.getResourceUUID() + " artifactName=" + dcaeEvent.getArtifactName()
+ + " instance count=" + instanceCount + " isTest=" + isTest;
logger.info("POST dcae event {}", msgInfo);
if (isTest) {
logger.warn("Ignorning test event from DCAE");
* In case of issues
*/
public String getSdcProperties() throws IOException {
- return createPropertiesObjectByUUID("{}");
+ return ((ObjectNode) refProp.getJsonTemplate(GLOBAL_PROPERTIES_KEY)).toString();
}
/**
* @throws IOException
* In case of issue to convert CldsServiceCache to InputStream
*/
- public String getSdcPropertiesByServiceUUIDForRefresh(
- String serviceInvariantUUID, Boolean refresh)
- throws GeneralSecurityException, DecoderException, IOException {
+ public String getSdcPropertiesByServiceUUIDForRefresh(String serviceInvariantUUID, Boolean refresh)
+ throws GeneralSecurityException, DecoderException, IOException {
util.entering(request, "CldsService: GET sdc properties by uuid");
Date startTime = new Date();
CldsServiceData cldsServiceData = new CldsServiceData();
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
auditLogger.info("GET sdc properties by uuid completed");
- util.exiting("200", "Get sdc properties by uuid success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+ util.exiting("200", "Get sdc properties by uuid success", Level.INFO,
+ ONAPLogConstants.ResponseStatus.COMPLETED);
return sdcProperties;
}
return serviceNode.toString();
}
- private String createPropertiesObjectByUUID(String cldsResponseStr) throws IOException {
- ObjectMapper mapper = JacksonUtils.getObjectMapperInstance();
- SdcServiceDetail cldsSdcServiceDetail = mapper.readValue(cldsResponseStr, SdcServiceDetail.class);
- ObjectNode globalPropsJson = (ObjectNode) refProp.getJsonTemplate(GLOBAL_PROPERTIES_KEY);
- if (cldsSdcServiceDetail != null && cldsSdcServiceDetail.getUuid() != null) {
- /**
- * to create json with vf, alarm and locations
- */
- ObjectNode serviceObjectNode = createEmptyVfAlarmObject();
- ObjectNode vfObjectNode = mapper.createObjectNode();
- /**
- * to create json with vf and vfresourceId
- */
- createVfObjectNode(vfObjectNode, cldsSdcServiceDetail.getResources());
- serviceObjectNode.putPOJO(cldsSdcServiceDetail.getInvariantUUID(), vfObjectNode);
- ObjectNode byServiceBasicObjetNode = mapper.createObjectNode();
- byServiceBasicObjetNode.putPOJO("byService", serviceObjectNode);
- /**
- * to create json with VFC Node
- */
- ObjectNode emptyvfcobjectNode = createByVFCObjectNode(cldsSdcServiceDetail.getResources());
- byServiceBasicObjetNode.putPOJO("byVf", emptyvfcobjectNode);
- globalPropsJson.putPOJO("shared", byServiceBasicObjetNode);
- logger.info("valuie of objNode: {}", globalPropsJson);
- }
- return globalPropsJson.toString();
- }
-
- private ObjectNode createEmptyVfAlarmObject() {
- ObjectMapper mapper = JacksonUtils.getObjectMapperInstance();
- ObjectNode emptyObjectNode = mapper.createObjectNode();
- emptyObjectNode.put("", "");
- ObjectNode vfObjectNode = mapper.createObjectNode();
- vfObjectNode.putPOJO("vf", emptyObjectNode);
- vfObjectNode.putPOJO("location", emptyObjectNode);
- vfObjectNode.putPOJO("alarmCondition", emptyObjectNode);
- ObjectNode emptyServiceObjectNode = mapper.createObjectNode();
- emptyServiceObjectNode.putPOJO("", vfObjectNode);
- return emptyServiceObjectNode;
- }
-
- private void createVfObjectNode(ObjectNode vfObjectNode2, List<SdcResource> rawCldsSdcResourceList) {
- ObjectMapper mapper = JacksonUtils.getObjectMapperInstance();
- ObjectNode vfNode = mapper.createObjectNode();
- vfNode.put("", "");
- // To remove repeated resource instance name from
- // resourceInstanceList
- List<SdcResource> cldsSdcResourceList = sdcCatalogServices
- .removeDuplicateSdcResourceInstances(rawCldsSdcResourceList);
- /**
- * Creating vf resource node using cldsSdcResource Object
- */
- if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) {
- for (SdcResource cldsSdcResource : cldsSdcResourceList) {
- if (cldsSdcResource != null && "VF".equalsIgnoreCase(cldsSdcResource.getResoucreType())) {
- vfNode.put(cldsSdcResource.getResourceUUID(), cldsSdcResource.getResourceName());
- }
- }
- }
- vfObjectNode2.putPOJO("vf", vfNode);
- /**
- * creating location json object using properties file value
- */
- ObjectNode locationJsonNode;
- try {
- locationJsonNode = (ObjectNode) mapper.readValue(refProp.getStringValue("ui.location.default"),
- JsonNode.class);
- } catch (IOException e) {
- logger.error("Unable to load ui.location.default JSON in clds-references.properties properly", e);
- throw new CldsConfigException(
- "Unable to load ui.location.default JSON in clds-references.properties properly", e);
- }
- vfObjectNode2.putPOJO("location", locationJsonNode);
- /**
- * creating alarm json object using properties file value
- */
- String alarmStringValue = refProp.getStringValue("ui.alarm.default");
- logger.info("value of alarm: {}", alarmStringValue);
- ObjectNode alarmStringJsonNode;
- try {
- alarmStringJsonNode = (ObjectNode) mapper.readValue(alarmStringValue, JsonNode.class);
- } catch (IOException e) {
- logger.error("Unable to ui.alarm.default JSON in clds-references.properties properly", e);
- throw new CldsConfigException("Unable to load ui.alarm.default JSON in clds-references.properties properly",
- e);
- }
- vfObjectNode2.putPOJO("alarmCondition", alarmStringJsonNode);
- }
-
- private ObjectNode createByVFCObjectNode(List<SdcResource> cldsSdcResourceList) {
- ObjectMapper mapper = JacksonUtils.getObjectMapperInstance();
- ObjectNode emptyObjectNode = mapper.createObjectNode();
- ObjectNode emptyvfcobjectNode = mapper.createObjectNode();
- ObjectNode vfCObjectNode = mapper.createObjectNode();
- vfCObjectNode.putPOJO("vfC", emptyObjectNode);
- ObjectNode subVfCObjectNode = mapper.createObjectNode();
- subVfCObjectNode.putPOJO("vfc", emptyObjectNode);
- if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) {
- for (SdcResource cldsSdcResource : cldsSdcResourceList) {
- if (cldsSdcResource != null && "VF".equalsIgnoreCase(cldsSdcResource.getResoucreType())) {
- vfCObjectNode.putPOJO(cldsSdcResource.getResourceUUID(), subVfCObjectNode);
- }
- }
- }
- emptyvfcobjectNode.putPOJO("", vfCObjectNode);
- return emptyvfcobjectNode;
- }
-
public ResponseEntity<CldsModel> deployModel(String modelName, CldsModel model) {
util.entering(request, "CldsService: Deploy model");
Date startTime = new Date();
- Boolean errorCase = false;
+ String errorMessage = "";
try {
fillInCldsModel(model);
String bpmnJson = cldsBpmnTransformer.doXslTransformToString(model.getBpmnText());
if (model.getDeploymentId() != null && !model.getDeploymentId().isEmpty()) {
deploymentId = model.getDeploymentId();
} else {
- deploymentId = "closedLoop_" + UUID.randomUUID() + "_deploymentId";
- }
- String createNewDeploymentStatusUrl = dcaeDispatcherServices.createNewDeployment(deploymentId,
- model.getTypeId(), modelProp.getGlobal().getDeployParameters());
- String operationStatus = dcaeDispatcherServices.getOperationStatusWithRetry(createNewDeploymentStatusUrl);
- if ("succeeded".equalsIgnoreCase(operationStatus)) {
- String artifactName = model.getControlName();
- if (artifactName != null) {
- artifactName = artifactName + ".yml";
- }
- DcaeEvent dcaeEvent = new DcaeEvent();
- /* set dcae events */
- dcaeEvent.setArtifactName(artifactName);
- dcaeEvent.setEvent(DcaeEvent.EVENT_DEPLOYMENT);
- CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), getUserId(), dcaeEvent.getCldsActionCd(),
- CldsEvent.ACTION_STATE_RECEIVED, null);
- model.setDeploymentId(deploymentId);
- model.save(cldsDao, getUserId());
- } else {
- logger.info("Deploy model (" + modelName + ") failed...Operation Status is - " + operationStatus);
- util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "DeployModel failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
- throw new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR,
- "Deploy model (" + modelName + ") failed...Operation Status is - " + operationStatus);
+ model.setDeploymentId(deploymentId = "closedLoop_" + UUID.randomUUID() + "_deploymentId");
}
- logger.info("Deploy model (" + modelName + ") succeeded...Deployment Id is - " + deploymentId);
+ model.setDeploymentStatusUrl(dcaeDispatcherServices.createNewDeployment(deploymentId, model.getTypeId(),
+ modelProp.getGlobal().getDeployParameters()));
+ CldsEvent.insEvent(cldsDao, model.getControlName(), getUserId(), CldsEvent.ACTION_DEPLOY,
+ CldsEvent.ACTION_STATE_INITIATED, null);
+ model.save(cldsDao, getUserId());
+ // This is a blocking call
+ checkDcaeDeploymentStatus(model, CldsEvent.ACTION_DEPLOY, true);
+ // Refresh the model object in any cases for new event
+ model = CldsModel.retrieve(cldsDao, model.getName(), false);
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
auditLogger.info("Deploy model completed");
} catch (Exception e) {
- errorCase = true;
+ errorMessage = e.getMessage();
logger.error("Exception occured during deployModel", e);
}
- if (errorCase) {
- util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "DeployModel failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+ if (!errorMessage.isEmpty()) {
+ model.setErrorMessageForUi(errorMessage);
+ util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "DeployModel failed", Level.INFO,
+ ONAPLogConstants.ResponseStatus.ERROR);
return new ResponseEntity<>(model, HttpStatus.INTERNAL_SERVER_ERROR);
+ } else {
+ util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+ return new ResponseEntity<>(model, HttpStatus.OK);
}
- util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
- return new ResponseEntity<>(model, HttpStatus.OK);
}
public ResponseEntity<CldsModel> unDeployModel(String modelName, CldsModel model) {
util.entering(request, "CldsService: Undeploy model");
Date startTime = new Date();
- Boolean errorCase = false;
+ String errorMessage = "";
try {
SecureServicePermission permisionManage = SecureServicePermission.create(cldsPermissionTypeClManage,
cldsPermissionInstance, CldsEvent.ACTION_UNDEPLOY);
isAuthorized(permisionManage);
isAuthorizedForVf(model);
- String operationStatusUndeployUrl = dcaeDispatcherServices.deleteExistingDeployment(model.getDeploymentId(),
- model.getTypeId());
- String operationStatus = dcaeDispatcherServices.getOperationStatusWithRetry(operationStatusUndeployUrl);
- if ("succeeded".equalsIgnoreCase(operationStatus)) {
- String artifactName = model.getControlName();
- if (artifactName != null) {
- artifactName = artifactName + ".yml";
- }
- DcaeEvent dcaeEvent = new DcaeEvent();
- // set dcae events
- dcaeEvent.setArtifactName(artifactName);
- dcaeEvent.setEvent(DcaeEvent.EVENT_UNDEPLOYMENT);
- CldsEvent.insEvent(cldsDao, model.getControlName(), getUserId(), dcaeEvent.getCldsActionCd(),
- CldsEvent.ACTION_STATE_RECEIVED, null);
- model.setDeploymentId(null);
- model.save(cldsDao, getUserId());
- } else {
- logger.info("Undeploy model (" + modelName + ") failed...Operation Status is - " + operationStatus);
- util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "UndeployModel failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
- throw new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR,
- "Undeploy model (" + modelName + ") failed...Operation Status is - " + operationStatus);
- }
- logger.info("Undeploy model (" + modelName + ") succeeded.");
+ model.setDeploymentStatusUrl(
+ dcaeDispatcherServices.deleteExistingDeployment(model.getDeploymentId(), model.getTypeId()));
+ CldsEvent.insEvent(cldsDao, model.getControlName(), getUserId(), CldsEvent.ACTION_UNDEPLOY,
+ CldsEvent.ACTION_STATE_INITIATED, null);
+ // clean the deployment ID
+ model.setDeploymentId(null);
+ model.save(cldsDao, getUserId());
+ // This is a blocking call
+ checkDcaeDeploymentStatus(model, CldsEvent.ACTION_UNDEPLOY, true);
+ // Refresh the model object in any cases for new event
+ model = CldsModel.retrieve(cldsDao, model.getName(), false);
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
auditLogger.info("Undeploy model completed");
} catch (Exception e) {
- errorCase = true;
+ errorMessage = e.getMessage();
logger.error("Exception occured during unDeployModel", e);
}
- if (errorCase) {
- util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "UndeployModel failed", Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+ if (!errorMessage.isEmpty()) {
+ model.setErrorMessageForUi(errorMessage);
+ util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "UndeployModel failed", Level.INFO,
+ ONAPLogConstants.ResponseStatus.ERROR);
return new ResponseEntity<>(model, HttpStatus.INTERNAL_SERVER_ERROR);
+ } else {
+ util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+ return new ResponseEntity<>(model, HttpStatus.OK);
+ }
+ }
+
+ private void checkDcaeDeploymentStatus(CldsModel model, String cldsEvent, boolean withRetry)
+ throws InterruptedException {
+ String operationStatus = withRetry
+ ? dcaeDispatcherServices.getOperationStatusWithRetry(model.getDeploymentStatusUrl())
+ : dcaeDispatcherServices.getOperationStatus(model.getDeploymentStatusUrl());
+ if ("succeeded".equalsIgnoreCase(operationStatus)) {
+ logger.info(cldsEvent + " model (" + model.getName() + ") succeeded...Deployment Id is - "
+ + model.getDeploymentId());
+ CldsEvent.insEvent(cldsDao, model.getControlName(), getUserId(), cldsEvent,
+ CldsEvent.ACTION_STATE_COMPLETED, null);
+ } else {
+ String info = "DCAE " + cldsEvent + " (" + model.getName() + ") failed...Operation Status is - "
+ + operationStatus;
+ logger.info(info);
+ CldsEvent.insEvent(cldsDao, model.getControlName(), getUserId(), cldsEvent, CldsEvent.ACTION_STATE_ERROR,
+ null);
+ util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "DCAE operation(" + cldsEvent + ") failed",
+ Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+ throw new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR, info);
}
- util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
- return new ResponseEntity<>(model, HttpStatus.OK);
}
private void checkForDuplicateServiceVf(String modelName, String modelPropText) throws IOException {
if (!modelName.equalsIgnoreCase(cldsModelProp.getName()) && service.equalsIgnoreCase(currentService)
&& resourceVf.get(0).equalsIgnoreCase(currentVf.get(0))) {
throw new BadRequestException("Same Service/VF already exists in " + cldsModelProp.getName()
- + " model, please select different Service/VF.");
+ + " model, please select different Service/VF.");
}
}
}
}
}
- private void updateAndInsertNewEvent(String cldsModelName, String cldsControlNamePrfx, CldsEvent event,
- String newAction) {
- // If model action is in submit/resubmit/distributed and user try
- // to save then we are changing action back to create.
- if (event != null && (CldsEvent.ACTION_SUBMIT.equalsIgnoreCase(event.getActionCd())
- || CldsEvent.ACTION_RESUBMIT.equalsIgnoreCase(event.getActionCd())
- || CldsEvent.ACTION_DISTRIBUTE.equalsIgnoreCase(event.getActionCd()))) {
- CldsEvent newEvent = new CldsEvent();
- newEvent.setUserid(getUserId());
- newEvent.setActionCd(newAction);
- newEvent.setActionStateCd(CldsEvent.ACTION_STATE_COMPLETED);
- cldsDao.insEvent(cldsModelName, cldsControlNamePrfx, null, newEvent);
- }
- }
-
// Created for the integration test
- public void setLoggingUtil (LoggingUtils utilP) {
- util = utilP;
+ public void setLoggingUtil(LoggingUtils utilP) {
+ util = utilP;
}
}
\ No newline at end of file
Code Review / clamp.git / blobdiff