import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
permissionList.add(SecureServicePermission
.create(applicationContext.getEnvironment().getProperty(PERM_TOSCA), cldsPermissionInstance, READ));
permissionList.add(SecureServicePermission
- .create(applicationContext.getEnvironment().getProperty(PERM_TOSCA), cldsPermissionInstance,
- UPDATE));
+ .create(applicationContext.getEnvironment().getProperty(PERM_TOSCA),
+ cldsPermissionInstance, UPDATE));
}
return permissionList;
}
}
}
}
-}
\ No newline at end of file
+}
private DistributionStatusEnum distributionStatus;
private long timestamp;
+ /**
+ * Distribution status message constructor.
+ *
+ * @param artifactUrl
+ * Url of specific SDC artifact(resource)
+ * @param consumerId
+ * Unique ID of SDC component instance
+ * @param distributionId
+ * Distribution ID published in the distribution notification.
+ * @param distributionStatusEnum
+ * Status to send in the message
+ * @param timestamp
+ * Timestamp of the message
+ */
public DistributionStatusMessage(final String artifactUrl, final String consumerId, final String distributionId,
- final DistributionStatusEnum distributionStatusEnum, final long timestampL) {
- artifactURL = artifactUrl;
- consumerID = consumerId;
- distributionID = distributionId;
- distributionStatus = distributionStatusEnum;
- timestamp = timestampL;
+ final DistributionStatusEnum distributionStatusEnum, final long timestamp) {
+ this.artifactURL = artifactUrl;
+ this.consumerID = consumerId;
+ this.distributionID = distributionId;
+ this.distributionStatus = distributionStatusEnum;
+ this.timestamp = timestamp;
}
@Override
import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;
import org.onap.clamp.clds.exception.sdc.controller.SdcDownloadException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller;
return downloadResult;
}
- private void sendSdcNotification(NotificationType notificationType, String artifactUrl, String consumerID,
- String distributionID, DistributionStatusEnum status, String errorReason,
+ private void sendSdcNotification(NotificationType notificationType, String artifactUrl, String consumerId,
+ String distributionId, DistributionStatusEnum status, String errorReason,
long timestamp) {
String event = "Sending " + notificationType.name() + "(" + status.name() + ")"
+ " notification to SDC for artifact:" + artifactUrl;
logger.info(event);
String action = "";
try {
- IDistributionStatusMessage message = new DistributionStatusMessage(artifactUrl, consumerID, distributionID,
+ IDistributionStatusMessage message = new DistributionStatusMessage(artifactUrl, consumerId, distributionId,
status, timestamp);
switch (notificationType) {
case DOWNLOAD:
* ===================================================================
*
*/
+
package org.onap.clamp.clds.sdc.controller.installer;
import java.util.LinkedList;
return clampCsarPath + "/" + controllerName + "/" + artifactElement.getArtifactName();
}
- private IArtifactInfo searchForUniqueCsar(INotificationData iNotif) throws CsarHandlerException {
- List<IArtifactInfo> serviceArtifacts = iNotif.getServiceArtifacts();
+ private IArtifactInfo searchForUniqueCsar(INotificationData notificationData) throws CsarHandlerException {
+ List<IArtifactInfo> serviceArtifacts = notificationData.getServiceArtifacts();
for (IArtifactInfo artifact : serviceArtifacts) {
if (artifact.getArtifactType().equals(CSAR_TYPE)) {
return artifact;
}
private void createPolicyModel(CsarHandler csar) throws PolicyModelException {
- try{
+ try {
Optional<String> policyModelYaml = csar.getPolicyModelYaml();
// save policy model into the database
} catch (IOException e) {
if (policyName != null) {
policyNameList.add(filteredPolicyName);
} else {
- String inputPolicyName = (String) ((Map<String, Object>) ((Map<String, Object>) ((Map<String, Object>) ef
- .getValue()).get("properties")).get("policy_id")).get(GET_INPUT_BLUEPRINT_PARAM);
+ String inputPolicyName = (String) ((Map<String, Object>) ((Map<String, Object>) ((Map<String, Object>)
+ ef.getValue()).get("properties")).get("policy_id")).get(GET_INPUT_BLUEPRINT_PARAM);
if (inputPolicyName != null) {
policyNameList.add(GET_INPUT_BLUEPRINT_PARAM);
}
/**
* This call must be done when deploying the SDC notification as this call get
- * the latest version of the artifact (version can be specified to DCAE call)
+ * the latest version of the artifact (version can be specified to DCAE call).
*
* @return The DcaeInventoryResponse object containing the dcae values
*/
private CldsTemplate createFakeCldsTemplate(CsarHandler csar, BlueprintArtifact blueprintArtifact,
BlueprintParserFilesConfiguration configFiles) throws IOException, SdcArtifactInstallerException {
- Set<MicroService> microServicesFromBlueprint = blueprintParser.getMicroServices(blueprintArtifact.getDcaeBlueprint()) ;
+ Set<MicroService> microServicesFromBlueprint = blueprintParser.getMicroServices(
+ blueprintArtifact.getDcaeBlueprint()) ;
List<MicroService> microServicesChain = chainGenerator.getChainOfMicroServices(microServicesFromBlueprint);
- if(microServicesChain.isEmpty()) {
+ if (microServicesChain.isEmpty()) {
microServicesChain = blueprintParser.fallbackToOneMicroService(blueprintArtifact.getDcaeBlueprint());
}
String imageText = svgFacade.getSvgImage(microServicesChain);
if (dcaeInventoryResponse == null) {
throw new SdcArtifactInstallerException(
- "DCAE inventory response is NULL, query to DCAE fail to be answered properly, this is required to deploy CSAR properly !!!");
+ "DCAE inventory response is NULL, query to DCAE fail to be answered properly, "
+ + "this is required to deploy CSAR properly !!!");
}
try {
CldsModel cldsModel = new CldsModel();
}
MicroService that = (MicroService) o;
return name.equals(that.name) && modelType.equals(that.modelType) && inputFrom.equals(that.inputFrom)
- && mappedNameJpa.equals(that.mappedNameJpa);
+ && mappedNameJpa.equals(that.mappedNameJpa);
}
@Override
* Copyright (C) 2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@Autowired
private CldsDao cldsDao;
-
+
private LoggingUtils util = new LoggingUtils(logger);
-
+
@PostConstruct
private final void initConstruct() {
*/
public ResponseEntity<CldsDictionary> createOrUpdateDictionary(String dictionaryName,
CldsDictionary cldsDictionary) {
- Date startTime = new Date();
+ final Date startTime = new Date();
LoggingUtils.setRequestContext("CldsDictionaryService: createOrUpdateDictionary", getPrincipalName());
// TODO revisit based on new permissions
isAuthorized(permissionUpdateTosca);
cldsDictionary.setDictionaryName(dictionaryName);
}
cldsDictionary.save(dictionaryName, cldsDao, getUserId());
- LoggingUtils.setTimeContext(startTime, new Date());
- LoggingUtils.setResponseContext("0", "createOrUpdateDictionary success", this.getClass().getName());
- auditLogger.info("createOrUpdateDictionary completed");
+ auditLogInfo("createOrUpdateDictionary", startTime);
return new ResponseEntity<>(cldsDictionary, HttpStatus.OK);
}
*/
public ResponseEntity<CldsDictionaryItem> createOrUpdateDictionaryElements(String dictionaryName,
CldsDictionaryItem dictionaryItem) {
- Date startTime = new Date();
+ final Date startTime = new Date();
LoggingUtils.setRequestContext("CldsDictionaryService: createOrUpdateDictionaryElements", getPrincipalName());
// TODO revisit based on new permissions
isAuthorized(permissionUpdateTosca);
dictionaryItem.save(dictionaryName, cldsDao, getUserId());
- LoggingUtils.setTimeContext(startTime, new Date());
- LoggingUtils.setResponseContext("0", "createOrUpdateDictionaryElements success", this.getClass().getName());
- auditLogger.info("createOrUpdateDictionaryElements completed");
+ auditLogInfo("createOrUpdateDictionaryElements", startTime);
return new ResponseEntity<>(dictionaryItem, HttpStatus.OK);
}
* @return CldsDictionary List List of CldsDictionary available in DB
*/
public ResponseEntity<List<CldsDictionary>> getAllDictionaryNames() {
- Date startTime = new Date();
+ final Date startTime = new Date();
LoggingUtils.setRequestContext("CldsDictionaryService: getAllDictionaryNames", getPrincipalName());
// TODO revisit based on new permissions
isAuthorized(permissionReadTosca);
List<CldsDictionary> dictionaries = cldsDao.getDictionary(null, null);
- LoggingUtils.setTimeContext(startTime, new Date());
- LoggingUtils.setResponseContext("0", "getAllDictionaryNames success", this.getClass().getName());
- auditLogger.info("getAllDictionaryNames completed");
+ auditLogInfo("getAllDictionaryNames", startTime);
return new ResponseEntity<>(dictionaries, HttpStatus.OK);
}
* dictionary name
*/
public ResponseEntity<List<CldsDictionaryItem>> getDictionaryElementsByName(String dictionaryName) {
- Date startTime = new Date();
+ final Date startTime = new Date();
LoggingUtils.setRequestContext("CldsDictionaryService: getDictionaryElementsByName", getPrincipalName());
// TODO revisit based on new permissions
isAuthorized(permissionReadTosca);
List<CldsDictionaryItem> dictionaryItems = cldsDao.getDictionaryElements(dictionaryName, null, null);
- LoggingUtils.setTimeContext(startTime, new Date());
- LoggingUtils.setResponseContext("0", "getAllDictionaryNames success", this.getClass().getName());
- auditLogger.info("getAllDictionaryNames completed");
+ auditLogInfo("getDictionaryElementsByName", startTime);
return new ResponseEntity<>(dictionaryItems, HttpStatus.OK);
}
*/
public List<CldsMonitoringDetails> getCldsDetails() {
util.entering(request, "CldsService: GET model details");
- Date startTime = new Date();
- final List<CldsMonitoringDetails> cldsMonitoringDetailsList = cldsDao.getCldsMonitoringDetails();
+
+ final Date startTime = new Date();
+ List<CldsMonitoringDetails> cldsMonitoringDetailsList = cldsDao.getCldsMonitoringDetails();
+
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
auditLogger.info("GET cldsDetails completed");
*/
public CldsInfo getCldsInfo() {
util.entering(request, "CldsService: GET cldsInfo");
- Date startTime = new Date();
+ final Date startTime = new Date();
LoggingUtils.setTimeContext(startTime, new Date());
CldsInfoProvider cldsInfoProvider = new CldsInfoProvider(this);
*/
public String getBpmnXml(String modelName) {
util.entering(request, "CldsService: GET model bpmn");
- Date startTime = new Date();
+ final Date startTime = new Date();
isAuthorized(permissionReadCl);
logger.info("GET bpmnText for modelName={}", modelName);
final CldsModel model = CldsModel.retrieve(cldsDao, modelName, false);
*/
public String getImageXml(String modelName) {
util.entering(request, "CldsService: GET model image");
- Date startTime = new Date();
+ final Date startTime = new Date();
isAuthorized(permissionReadCl);
logger.info("GET imageText for modelName={}", modelName);
final CldsModel model = CldsModel.retrieve(cldsDao, modelName, false);
logger.info("PUT imageText={}", cldsModel.getImageText());
fillInCldsModel(cldsModel);
cldsModel.save(cldsDao, getUserId());
-
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
auditLogger.info("PUT model completed");
*/
public List<ValueItem> getModelNames() {
util.entering(request, "CldsService: GET model names");
- Date startTime = new Date();
+ final Date startTime = new Date();
isAuthorized(permissionReadCl);
logger.info("GET list of model names");
final List<ValueItem> names = cldsDao.getModelNames();
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();
+ final Date startTime = new Date();
String errorMessage = "";
String actionCd = "";
try {
instanceCount = dcaeEvent.getInstances().size();
}
String msgInfo = "event=" + dcaeEvent.getEvent() + " serviceUUID=" + dcaeEvent.getServiceUUID()
- + " resourceUUID=" + dcaeEvent.getResourceUUID() + " artifactName=" + dcaeEvent.getArtifactName()
+ + " resourceUUID=" + dcaeEvent.getResourceUUID()
+ + " artifactName=" + dcaeEvent.getArtifactName()
+ " instance count=" + instanceCount + " isTest=" + isTest;
logger.info("POST dcae event {}", msgInfo);
if (isTest) {
*/
public ResponseEntity<CldsModel> deployModel(String modelName, CldsModel model) {
util.entering(request, "CldsService: Deploy model");
- Date startTime = new Date();
+ final Date startTime = new Date();
String errorMessage = "";
try {
fillInCldsModel(model);
*/
public ResponseEntity<CldsModel> unDeployModel(String modelName, CldsModel model) {
util.entering(request, "CldsService: Undeploy model");
- Date startTime = new Date();
+ final Date startTime = new Date();
String errorMessage = "";
try {
SecureServicePermission permisionManage = SecureServicePermission.create(cldsPermissionTypeClManage,
public void setLoggingUtil(LoggingUtils utilP) {
util = utilP;
}
-}
\ No newline at end of file
+}
import org.onap.clamp.clds.model.CldsTemplate;
import org.onap.clamp.clds.model.ValueItem;
import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.ONAPLogConstants;
-import org.slf4j.event.Level;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@PostConstruct
private final void afterConstruction() {
- permissionReadTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance,
- "read");
- permissionUpdateTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance,
- "update");
+ permissionReadTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate,
+ cldsPermissionInstance, "read");
+ permissionUpdateTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate,
+ cldsPermissionInstance, "update");
}
@Autowired
*/
public String getBpmnTemplate(String templateName) {
util.entering(request, "CldsTemplateService: GET template bpmn");
- Date startTime = new Date();
+ final Date startTime = new Date();
isAuthorized(permissionReadTemplate);
logger.info("GET bpmnText for templateName=" + templateName);
- final CldsTemplate template = CldsTemplate.retrieve(cldsDao, templateName, false);
- // audit log
- LoggingUtils.setTimeContext(startTime, new Date());
- auditLogger.info("GET template bpmn completed");
- util.exiting("200", "Get template bpmn success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+
+ CldsTemplate template = CldsTemplate.retrieve(cldsDao, templateName, false);
+ auditLogInfo(util, "GET template bpmn", startTime);
return template.getBpmnText();
}
*/
public String getImageXml(String templateName) {
util.entering(request, "CldsTemplateService: GET template image");
- Date startTime = new Date();
+ final Date startTime = new Date();
isAuthorized(permissionReadTemplate);
logger.info("GET imageText for templateName=" + templateName);
- final CldsTemplate template = CldsTemplate.retrieve(cldsDao, templateName, false);
- // audit log
- LoggingUtils.setTimeContext(startTime, new Date());
- auditLogger.info("GET template image completed");
- util.exiting("200", "Get template image success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+
+ CldsTemplate template = CldsTemplate.retrieve(cldsDao, templateName, false);
+ auditLogInfo(util, "GET template image", startTime);
return template.getImageText();
}
final Date startTime = new Date();
isAuthorized(permissionReadTemplate);
logger.info("GET model for templateName=" + templateName);
+
CldsTemplate template = CldsTemplate.retrieve(cldsDao, templateName, false);
template.setUserAuthorizedToUpdate(isAuthorizedNoException(permissionUpdateTemplate));
- // audit log
- LoggingUtils.setTimeContext(startTime, new Date());
- auditLogger.info("GET template completed");
- util.exiting("200", "Get template success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+ auditLogInfo(util, "GET template", startTime);
return template;
}
logger.info("PUT imageText=" + cldsTemplate.getImageText());
cldsTemplate.setName(templateName);
cldsTemplate.save(cldsDao, null);
- // audit log
- LoggingUtils.setTimeContext(startTime, new Date());
- auditLogger.info("PUT template completed");
- util.exiting("200", "Put template success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+ auditLogInfo(util, "PUT template", startTime);
return cldsTemplate;
}
*/
public List<ValueItem> getTemplateNames() {
util.entering(request, "CldsTemplateService: GET template names");
- Date startTime = new Date();
+ final Date startTime = new Date();
isAuthorized(permissionReadTemplate);
logger.info("GET list of template names");
- final List<ValueItem> names = cldsDao.getTemplateNames();
- // audit log
- LoggingUtils.setTimeContext(startTime, new Date());
- auditLogger.info("GET template names completed");
- util.exiting("200", "Get template names success", Level.INFO, ONAPLogConstants.ResponseStatus.COMPLETED);
+
+ List<ValueItem> names = cldsDao.getTemplateNames();
+ auditLogInfo(util, "GET template names", startTime);
return names;
}
// Created for the integration test
public void setLoggingUtil(LoggingUtils utilP) {
- util = utilP;
+ util = utilP;
}
}
package org.onap.clamp.clds.service;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Optional;
isAuthorized(permissionUpdateTosca);
cldsToscaModel.setToscaModelName(toscaModelName);
cldsToscaModel = cldsToscaModel.save(cldsDao, refProp, policyClient, getUserId());
- LoggingUtils.setTimeContext(startTime, new Date());
- LoggingUtils.setResponseContext("0", "Parse Tosca model and save success", this.getClass().getName());
- auditLogger.info("Parse Tosca model and save completed");
+ auditLogInfo("Parse Tosca model and save", startTime);
return new ResponseEntity<>(cldsToscaModel, HttpStatus.CREATED);
}
* @return clds tosca models - list of CLDS tosca models
*/
public List<CldsToscaModel> getAllToscaModels() {
-
- Date startTime = new Date();
- LoggingUtils.setRequestContext("CldsToscaService: Get All tosca models", getPrincipalName());
// TODO revisit based on new permissions
+ final Date startTime = new Date();
+ LoggingUtils.setRequestContext("CldsToscaService: Get All tosca models", getPrincipalName());
isAuthorized(permissionReadTosca);
- final List<CldsToscaModel> cldsToscaModels = Optional.ofNullable(cldsDao.getAllToscaModels()).get();
- LoggingUtils.setTimeContext(startTime, new Date());
- LoggingUtils.setResponseContext("0", "Get All tosca models success", this.getClass().getName());
- auditLogger.info("Get All tosca models");
- return cldsToscaModels;
+
+ Optional<List<CldsToscaModel>> cldsToscaModels = Optional.ofNullable(cldsDao.getAllToscaModels());
+ auditLogInfo("Get All tosca models", startTime);
+ return cldsToscaModels.orElse(Collections.emptyList());
}
/**
* @return clds tosca model - CLDS tosca model for a given tosca model name
*/
public CldsToscaModel getToscaModel(String toscaModelName) {
- Date startTime = new Date();
+ final Date startTime = new Date();
LoggingUtils.setRequestContext("CldsToscaService: Get tosca models by model name", getPrincipalName());
// TODO revisit based on new permissions
isAuthorized(permissionReadTosca);
- final List<CldsToscaModel> cldsToscaModels = Optional.ofNullable(cldsDao.getToscaModelByName(toscaModelName))
- .get();
- LoggingUtils.setTimeContext(startTime, new Date());
- LoggingUtils.setResponseContext("0", "Get tosca models by model name success", this.getClass().getName());
- auditLogger.info("GET tosca models by model name completed");
- return cldsToscaModels.get(0);
+
+ Optional<List<CldsToscaModel>> cldsToscaModels = Optional.ofNullable(
+ cldsDao.getToscaModelByName(toscaModelName));
+ auditLogInfo("Get tosca models by model name", startTime);
+ return cldsToscaModels.map(models -> models.get(0)).orElse(null);
}
/**
* REST service that retrieves a CLDS Tosca model lists for a policy type
* from the database.
- *
* @param policyType
* The type of the policy
* @return clds tosca model - CLDS tosca model for a given policy type
*/
public CldsToscaModel getToscaModelsByPolicyType(String policyType) {
- Date startTime = new Date();
+ final Date startTime = new Date();
LoggingUtils.setRequestContext("CldsToscaService: Get tosca models by policyType", getPrincipalName());
// TODO revisit based on new permissions
isAuthorized(permissionReadTosca);
- final List<CldsToscaModel> cldsToscaModels = Optional.ofNullable(cldsDao.getToscaModelByPolicyType(policyType))
- .get();
- LoggingUtils.setTimeContext(startTime, new Date());
- LoggingUtils.setResponseContext("0", "Get tosca models by policyType success", this.getClass().getName());
- auditLogger.info("GET tosca models by policyType completed");
- return cldsToscaModels.get(0);
+
+ Optional<List<CldsToscaModel>> cldsToscaModels = Optional.ofNullable(
+ cldsDao.getToscaModelByPolicyType(policyType));
+ auditLogInfo("Get tosca models by policyType", startTime);
+ return cldsToscaModels.map(models -> models.get(0)).orElse(null);
}
public ResponseEntity<?> deleteToscaModelById(String toscaModeId) {
// TODO
return null;
}
-
+
// Created for the integration test
public void setLoggingUtil(LoggingUtils utilP) {
util = utilP;
import javax.ws.rs.NotAuthorizedException;
import org.onap.clamp.clds.util.LoggingUtils;
+import org.onap.clamp.clds.util.ONAPLogConstants;
+import org.slf4j.event.Level;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContext;
return false;
}
+
+ protected void auditLogInfo(LoggingUtils util, String actionDescription, Date startTime) {
+ LoggingUtils.setTimeContext(startTime, new Date());
+ auditLogger.info(actionDescription + " completed");
+ util.exiting("200", actionDescription + " success", Level.INFO,
+ ONAPLogConstants.ResponseStatus.COMPLETED);
+ }
+
+ protected void auditLogInfo(String actionDescription, Date startTime) {
+
+ LoggingUtils.setTimeContext(startTime, new Date());
+ LoggingUtils.setResponseContext("0", actionDescription + " success",
+ this.getClass().getName());
+ auditLogger.info(actionDescription + " completed");
+ }
}
\ No newline at end of file
}
@Test(expected = TcaRequestFormatterException.class)
- public void shouldThrowTcaRequestFormatterException() throws IOException{
+ public void shouldThrowTcaRequestFormatterException() throws IOException {
//given
String service = "TestService";
String policy = "TestService_scope.PolicyName";
//then
TcaRequestFormatter.createPolicyContent(clampProperties, modelProperties, service, policy, tca);
}
-}
\ No newline at end of file
+}
@Test(expected = BadRequestException.class)
public void testHttpsGet404() throws IOException {
- httpConnectionManager.doHttpRequest("https://localhost:" + this.httpsPort + "/designer/index1.html",
- "GET", null, null, "DCAE", null, null);
+ httpConnectionManager.doHttpRequest("https://localhost:" + this.httpsPort + "/designer/index1.html", "GET",
+ null, null, "DCAE", null, null);
fail("Should have raised an BadRequestException");
}
@Test(expected = BadRequestException.class)
public void testHttpsPost404() throws IOException {
- httpConnectionManager.doHttpRequest("https://localhost:" + this.httpsPort + "/designer/index1.html",
- "POST", "", "application/json", "DCAE", null, null);
+ httpConnectionManager.doHttpRequest("https://localhost:" + this.httpsPort + "/designer/index1.html", "POST",
+ "", "application/json", "DCAE", null, null);
fail("Should have raised an BadRequestException");
}
@Test(expected = BadRequestException.class)
public void testHttpException() throws IOException {
- httpConnectionManager.doHttpRequest("http://localhost:" + this.httpsPort + "/designer/index.html", "GET",
+ httpConnectionManager.doHttpRequest("http://localhost:" + this.httpsPort + "/designer/index.html", "GET",
null, null, "DCAE", null, null);
fail("Should have raised an BadRequestException");
}
*/
@Test
public void testGetFileContent() throws IOException {
- String location = "{\n\t\"DC1\": \"Data Center 1\",\n\t\"DC2\": \"Data Center 2\",\n\t\"DC3\": \"Data Center 3\"\n}\n";
+ String location = "{\n\t\"DC1\": \"Data Center 1\","
+ + "\n\t\"DC2\": \"Data Center 2\",\n\t\"DC3\": \"Data Center 3\"\n}\n";
String content = refProp.getFileContent("ui.location.default");
assertEquals(location, content);
// Test composite key
* Copyright (C) 2019 Nokia Intellectual Property. All rights
* reserved.
* ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* ===================================================================
*
*/
+
package org.onap.clamp.clds.sdc.controller.installer;
import com.google.gson.Gson;
private static JsonObject jsonObjectBlueprintWithoutProperties;
private static JsonObject jsonObjectBlueprintWithoutRelationships;
+ /**
+ * Method to load Blueprints before all test.
+ *
+ * @throws IOException
+ * In case of issues when opening the files
+ */
@BeforeClass
public static void loadBlueprints() throws IOException {
microServiceTheWholeBlueprintValid = ResourceFileUtil
.getResourceAsString("clds/single-microservice-fragment-without-name.yaml");
String microServiceBlueprintWithoutProperties = ResourceFileUtil
.getResourceAsString("clds/single-microservice-fragment-without-properties.yaml");
- String microServiceBlueprintWithoutRelationships = ResourceFileUtil
- .getResourceAsString("clds/single-microservice-fragment-without-relationships.yaml");
jsonObjectBlueprintValid = yamlToJson(microServiceBlueprintValid);
jsonObjectBlueprintWithoutName = yamlToJson(microServiceBlueprintWithoutName);
jsonObjectBlueprintWithoutProperties = yamlToJson(microServiceBlueprintWithoutProperties);
+
+ String microServiceBlueprintWithoutRelationships = ResourceFileUtil
+ .getResourceAsString("clds/single-microservice-fragment-without-relationships.yaml");
jsonObjectBlueprintWithoutRelationships = yamlToJson(microServiceBlueprintWithoutRelationships);
}
}
@Test
- public void fallBackToOneMicroServiceTCATest() {
- MicroService tcaMS = new MicroService(BlueprintParser.TCA, "onap.policies.monitoring.cdap.tca.hi.lo.app", "",
- "");
- List<MicroService> expected = Collections.singletonList(tcaMS);
+ public void fallBackToOneMicroServiceTcaTest() {
+ MicroService tcaMs = new MicroService(BlueprintParser.TCA,
+ "onap.policies.monitoring.cdap.tca.hi.lo.app", "", "");
+ List<MicroService> expected = Collections.singletonList(tcaMs);
List<MicroService> actual = new BlueprintParser().fallbackToOneMicroService(microServiceBlueprintOldStyleTCA);
Assert.assertEquals(expected, actual);
@Test
public void fallBackToOneMicroServiceHolmesTest() {
- MicroService holmesMS = new MicroService(BlueprintParser.HOLMES, "onap.policies.monitoring.cdap.tca.hi.lo.app",
- "", "");
+ MicroService holmesMs = new MicroService(BlueprintParser.HOLMES,
+ "onap.policies.monitoring.cdap.tca.hi.lo.app", "", "");
- List<MicroService> expected = Collections.singletonList(holmesMS);
+ List<MicroService> expected = Collections.singletonList(holmesMs);
List<MicroService> actual = new BlueprintParser()
.fallbackToOneMicroService(microServiceBlueprintOldStyleHolmes);
* ===================================================================
*
*/
+
package org.onap.clamp.clds.sdc.controller.installer;
import java.util.Arrays;
List<MicroService> actualList = new ChainGenerator().getChainOfMicroServices(inputSet);
Assert.assertTrue(actualList.isEmpty());
}
-}
\ No newline at end of file
+}
* Copyright (C) 2019 Nokia. All rights
* reserved.
* ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Assert.assertNull(doc.getDoctype());
}
-
+ /**
+ * Method to parse String into XmlDocument.
+ *
+ * @param res
+ * String to parse
+ * @return
+ * XmlDocument
+ * @throws ParserConfigurationException
+ * In case of issues with parse the document
+ * @throws SAXException
+ * In case of bad format of res
+ * @throws IOException
+ * In case of issues creating the document
+ */
public static Document parseStringToXmlDocument(String res)
throws ParserConfigurationException, SAXException, IOException {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
return db.parse(is);
}
-}
\ No newline at end of file
+}
* Copyright (C) 2019 Nokia. All rights
* reserved.
* ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
MicroService ms2 = new MicroService("ms2", "", "", "ms2_jpa_id");
String policy = "OperationalPolicy";
- List<MicroService> microServices = Arrays.asList(ms1, ms2);
+ final List<MicroService> microServices = Arrays.asList(ms1, ms2);
ClampGraphBuilder clampGraphBuilder = new ClampGraphBuilder(mockPainter);
clampGraphBuilder.collector(collector).addMicroService(ms1).addMicroService(ms2).policy(policy).build();
ClampGraphBuilder clampGraphBuilder = new ClampGraphBuilder(mockPainter);
clampGraphBuilder.collector(collector).policy(policy).build();
}
-}
\ No newline at end of file
+}
private DocumentBuilder mockDocumentBuilder;
@Test
- public void getAsSVGTest() throws IOException, ParserConfigurationException, SAXException {
+ public void getAsSvgTest() throws IOException, ParserConfigurationException, SAXException {
String expected = ResourceFileUtil.getResourceAsString("clds/util/file.xml");
Document document = XmlToolsTest.parseStringToXmlDocument(expected);
}
@Test
- public void getAsSVGLazyTest() throws IOException, ParserConfigurationException, SAXException {
+ public void getAsSvgLazyTest() throws IOException, ParserConfigurationException, SAXException {
String expected = ResourceFileUtil.getResourceAsString("clds/util/file.xml");
Document document = XmlToolsTest.parseStringToXmlDocument(expected);
Assert.assertEquals(expected.trim(), actualSecond.trim());
}
-}
\ No newline at end of file
+}
* Copyright (C) 2019 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
private MicroServicePolicy getMicroServicePolicy(String name, String modelType, String jsonRepresentation,
String policyTosca, String jsonProperties, boolean shared) {
- MicroServicePolicy µService = new MicroServicePolicy(name, modelType, policyTosca, shared,
+ MicroServicePolicy microService = new MicroServicePolicy(name, modelType, policyTosca, shared,
gson.fromJson(jsonRepresentation, JsonObject.class), new HashSet<>());
- µService.setProperties(new Gson().fromJson(jsonProperties, JsonObject.class));
- return µService;
+ microService.setProperties(new Gson().fromJson(jsonProperties, JsonObject.class));
+ return microService;
}
private LoopLog getLoopLog(LogType type, String message, Loop loop) {
@Test
@Transactional
- public void CrudTest() {
+ public void crudTest() {
Loop loopTest = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
"123456789", "https://dcaetest.org", "UUID-blueprint");
OperationalPolicy opPolicy = this.getOperationalPolicy("{\"type\":\"GUARD\"}", "GuardOpPolicyTest");
* Copyright (C) 2019 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
private MicroServicePolicy getMicroServicePolicy(String name, String modelType, String jsonRepresentation,
String policyTosca, String jsonProperties, boolean shared) {
- MicroServicePolicy µService = new MicroServicePolicy(name, modelType, policyTosca, shared,
+ MicroServicePolicy microService = new MicroServicePolicy(name, modelType, policyTosca, shared,
gson.fromJson(jsonRepresentation, JsonObject.class), new HashSet<>());
- µService.setProperties(new Gson().fromJson(jsonProperties, JsonObject.class));
+ microService.setProperties(new Gson().fromJson(jsonProperties, JsonObject.class));
- return µService;
+ return microService;
}
private LoopLog getLoopLog(LogType type, String message, Loop loop) {
}
@Test
- public void LoopGsonTest() throws IOException {
+ public void loopGsonTest() throws IOException {
Loop loopTest = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
"123456789", "https://dcaetest.org", "UUID-blueprint");
OperationalPolicy opPolicy = this.getOperationalPolicy(
Code Review / clamp.git / commitdiff