List<String> resourceUuidList = global.getResourceVf();\r
String serviceUuid = sdcCatalogServices.getServiceUuidFromServiceInvariantId(invariantServiceUuid);\r
String resourceUuid = "";\r
- if (resourceUuidList != null && resourceUuidList.size() > 0) {\r
+ if (resourceUuidList != null && !resourceUuidList.isEmpty()) {\r
resourceUuid = resourceUuidList.get(0).toString();\r
}\r
/* Invemtory service url is called in this method */\r
*/
@Override
public void execute(DelegateExecution execution) throws IOException, BuilderException, PolicyEngineException {
-
- // execution.setVariable("operationalPolicyRequestUuid",
- // operationalPolicyRequestUuid);
String responseMessage = null;
String operationalPolicyRequestUuid = null;
ModelProperties prop = ModelProperties.create(execution);
operationalPolicyRequestUuid = LoggingUtils.getRequestId();
Map<AttributeType, Map<String, String>> attributes = OperationalPolicyReq.formatAttributes(refProp,
prop, prop.getType(Policy.class).getId(), policyChain);
- responseMessage = policyClient.sendBrms(attributes, prop, operationalPolicyRequestUuid);
+ responseMessage = policyClient.sendBrmsPolicy(attributes, prop, operationalPolicyRequestUuid);
}
if (responseMessage != null) {
execution.setVariable("operationalPolicyResponseMessage", responseMessage.getBytes());
*/
public class PolicyClient {
+ protected static final String POLICY_PREFIX_BASE = "Config_";
+ protected static final String POLICY_PREFIX_BRMS_PARAM = "Config_BRMS_Param_";
+ protected static final String POLICY_PREFIX_MICROSERVICE = "Config_MS_";
+
protected static final String LOG_POLICY_PREFIX = "Response is ";
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(PolicyClient.class);
- protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
+ protected static final EELFLogger logger = EELFManager.getInstance()
+ .getLogger(PolicyClient.class);
+ protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
@Value("${org.onap.clamp.config.files.cldsPolicyConfig:'classpath:/clds/clds-policy-config.properties'}")
protected String cldsPolicyConfigFile;
protected RefProp refProp;
/**
- * Perform send of microservice policy.
+ * Perform BRMS policy type.
*
* @param attributes
* A map of attributes
* In case of issues with the PolicyEngine class
*
*/
- public String sendBrms(Map<AttributeType, Map<String, String>> attributes, ModelProperties prop,
+ public String sendBrms
Policy(Map<AttributeType, Map<String, String>> attributes, ModelProperties prop,
String policyRequestUuid) throws PolicyEngineException, IOException {
PolicyParameters policyParameters = new PolicyParameters();
}
/**
- * Perform send of microservice policy.
+ * Perform send of microservice policy in JSON.
*
* @param policyJson
* The policy JSON
* @throws IOException
* In case of issue with the Stream
*/
- public String sendMicroService(String policyJson, ModelProperties prop, String policyRequestUuid)
+ public String sendMicroServiceInJson(String policyJson, ModelProperties prop, String policyRequestUuid)
throws IOException, PolicyEngineException {
PolicyParameters policyParameters = new PolicyParameters();
return rtnMsg;
}
+ /**
+ * Perform send of base policy in OTHER type.
+ *
+ * @param configBody
+ * The config policy string body
+ * @param prop
+ * The ModelProperties
+ * @param policyRequestUuid
+ * The policy request UUID
+ * @return
+ * @throws IOException
+ * In case of issues with the policy engine class creation
+ * @throws PolicyEngineException
+ * In case of issue with the Stream
+ */
+ public String sendBasePolicyInOther(String configBody, ModelProperties prop, String policyRequestUuid)
+ throws IOException, PolicyEngineException {
+
+ PolicyParameters policyParameters = new PolicyParameters();
+
+ // Set Policy Type
+ policyParameters.setPolicyConfigType(PolicyConfigType.Base);
+ policyParameters.setEcompName(refProp.getStringValue("policy.ecomp.name"));
+ policyParameters.setPolicyName(prop.getCurrentPolicyScopeAndPolicyName());
+
+ policyParameters.setConfigBody(configBody);
+ policyParameters.setConfigBodyType(PolicyType.OTHER);
+ policyParameters.setConfigName("HolmesPolicy");
+
+ policyParameters.setRequestID(UUID.fromString(policyRequestUuid));
+
+ // Adding this line to clear the policy id from policy name while
+ // pushing to policy engine
+ prop.setPolicyUniqueId("");
+
+ String rtnMsg = send(policyParameters, prop, POLICY_PREFIX_BASE);
+ push(PolicyConfigType.Base.toString(), prop);
+
+ return rtnMsg;
+ }
+
/**
* Perform send of policy.
*
responseMessage = response.getResponseMessage();
}
} catch (Exception e) {
- logger.error("Exception occurred during policy communnication", e);
+ logger.error("Exception occurred during policy communication", e);
}
logger.info(LOG_POLICY_PREFIX + responseMessage);
response = policyEngine.pushPolicy(pushPolicyParameters);
responseMessage = response.getResponseMessage();
} catch (Exception e) {
- logger.error("Exception occurred during policy communnication", e);
+ logger.error("Exception occurred during policy communication", e);
}
logger.info(LOG_POLICY_PREFIX + responseMessage);
* In case of issues with the PolicyEngine creation
*/
public String deleteMicrosService(ModelProperties prop) throws PolicyEngineException, IOException {
- String policyNamePrefix = refProp.getStringValue("policy.ms.policyNamePrefix");
String policyType = refProp.getStringValue("policy.ms.type");
- return deletePolicy(policyNamePrefix, prop, policyType);
+ return deletePolicy(prop, policyType);
+ }
+
+ /**
+ * This method delete the Base policy.
+ *
+ * @param prop The model Properties
+ * @return A string with the answer from policy
+ * @throws PolicyEngineException In case of issues with the policy engine
+ * @throws IOException In case of issues with the stream
+ */
+ public String deleteBasePolicy(ModelProperties prop) throws PolicyEngineException, IOException {
+ return deletePolicy(prop, PolicyConfigType.Base.toString());
}
/**
* In case of issues with the PolicyEngine creation
*/
public String deleteBrms(ModelProperties prop) throws PolicyEngineException, IOException {
- String policyNamePrefix = refProp.getStringValue("policy.op.policyNamePrefix");
String policyType = refProp.getStringValue("policy.op.type");
- return deletePolicy(policyNamePrefix, prop, policyType);
+ return deletePolicy(prop, policyType);
}
/**
* Format and send delete PAP and PDP requests to Policy.
*
- * @param policyNamePrefix
- * The String policyNamePrefix
* @param prop
* The ModelProperties
+ *
* @return The response message from policy
* @throws IOException
* in case of issues with the Stream
* @throws PolicyEngineException
* In case of issues with the PolicyEngine class creation
*/
- protected String deletePolicy(String policyNamePrefix, ModelProperties prop, String policyType)
- throws PolicyEngineException, IOException {
+ protected String deletePolicy(ModelProperties prop, String policyType) throws PolicyEngineException, IOException {
DeletePolicyParameters deletePolicyParameters = new DeletePolicyParameters();
if (prop.getPolicyUniqueId() != null && !prop.getPolicyUniqueId().isEmpty()) {
}\r
\r
private String removeUnwantedBracesFromString(String id) {\r
- String idReworked = "";\r
- if (id != null && id.contains("\"")) {\r
- idReworked = id.replaceAll("\"", "");\r
- }\r
- return idReworked;\r
+ return (id != null) ? id.replaceAll("\"", "") : "";\r
}\r
\r
private List<CldsAlarmCondition> getAlarmCondtionsFromVfc(String vfcResponse) throws IOException {\r
String inputLine;\r
while ((inputLine = in.readLine()) != null) {\r
if (!inputLine.isEmpty()) {\r
- response.append(inputLine);\r
+ response.append(inputLine);\r
}\r
if (alarmConditions) {\r
response.append("\n");\r
alertDescNode.put(currCldsAlarmCondition.getAlarmConditionKey(),\r
currCldsAlarmCondition.getAlarmConditionKey());\r
}\r
+ }\r
}\r
- }\r
+\r
vfcObjectNode.putPOJO("alarmCondition", alarmCondNode);\r
vfcObjectNode.putPOJO("alertDescription", alertDescNode);\r
vfcResourceUuidObjectNode.putPOJO(currCldsVfcData.getVfcInvariantResourceUUID(), vfcObjectNode);\r
- }\r
+ }\r
}\r
} else {\r
alarmCondNode.put("", "");\r
getSdcAttributes((String) execution.getVariable("controlName"));
ModelProperties prop = ModelProperties.create(execution);
String bluprintPayload = SdcReq.formatBlueprint(refProp, prop, docText);
- String formatttedSdcReq = SdcReq.formatSdcReq(bluprintPayload, artifactName, artifactLabel, artifactType);
- if (formatttedSdcReq != null) {
- execution.setVariable("formattedArtifactReq", formatttedSdcReq.getBytes());
+ String formattedSdcReq = SdcReq.formatSdcReq(bluprintPayload, artifactName, artifactLabel, artifactType);
+ if (formattedSdcReq != null) {
+ execution.setVariable("formattedArtifactReq", formattedSdcReq.getBytes());
}
List<String> sdcReqUrlsList = SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, execution);
if (formattedSdcLocationReq != null) {
execution.setVariable("formattedLocationReq", formattedSdcLocationReq.getBytes());
}
- sdcCatalogServices.uploadToSdc(prop, userid, sdcReqUrlsList, formatttedSdcReq, formattedSdcLocationReq,
+ sdcCatalogServices.uploadToSdc(prop, userid, sdcReqUrlsList, formattedSdcReq, formattedSdcLocationReq,
artifactName, locationArtifactName);
}
StringMatch stringMatch = prop.getType(StringMatch.class);
if (stringMatch.isFound()) {
String policyJson = StringMatchPolicyReq.format(refProp, prop);
- String responseMessage = policyClient.sendMicroService(policyJson, prop, stringMatchPolicyRequestUuid);
+ String responseMessage = policyClient.sendMicroServiceInJson(policyJson, prop, stringMatchPolicyRequestUuid);
if (responseMessage != null) {
execution.setVariable("stringMatchPolicyResponseMessage", responseMessage.getBytes());
}
Tca tca = prop.getType(Tca.class);
if (tca.isFound()) {
String policyJson = TcaMPolicyReq.formatTca(refProp, prop);
- String responseMessage = policyClient.sendMicroService(policyJson, prop, tcaPolicyRequestUuid);
+ String responseMessage = policyClient.sendMicroServiceInJson(policyJson, prop, tcaPolicyRequestUuid);
if (responseMessage != null) {
execution.setVariable("tcaPolicyResponseMessage", responseMessage.getBytes());
}
String operationTopic = "";
String notificationTopic = "";
String controller = "";
- Tca tca = prop.getTca();
- if (tca.isFound()) {
+ Tca tca = prop.getType(Tca.class);
+ if (tca != null && tca.isFound()) {
if (!global.getActionSet().equalsIgnoreCase("enbRecipe")) {
throw new BadRequestException(
"Operation Policy validation problem: action set is not selected properly.");
String recipeTopic = refProp.getStringValue("op.recipeTopic", global.getService());
// ruleAttributes
- Map<String, String> ruleAttributes = new HashMap<String, String>();
+ Map<String, String> ruleAttributes = new HashMap<>();
- if (operationTopic == null || operationTopic.length() == 0) {
+ if (operationTopic == null || operationTopic.isEmpty()) {
logger.info("templateName=" + templateName);
logger.info("recipeTopic=" + recipeTopic);
logger.info("notificationTopic=" + notificationTopic);
}
// matchingAttributes
- Map<String, String> matchingAttributes = new HashMap<String, String>();
+ Map<String, String> matchingAttributes = new HashMap<>();
matchingAttributes.put("controller", controller);
- Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
+ Map<AttributeType, Map<String, String>> attributes = new HashMap<>();
attributes.put(AttributeType.RULE, ruleAttributes);
attributes.put(AttributeType.MATCHING, matchingAttributes);
builder.addResource(vfcResources);
// process each policy
- HashMap<String, org.onap.policy.controlloop.policy.Policy> policyObjMap = new HashMap<String, org.onap.policy.controlloop.policy.Policy>();
+ HashMap<String, org.onap.policy.controlloop.policy.Policy> policyObjMap = new HashMap<>();
List<PolicyItem> policyItemList = orderParentFirst(policyChain.getPolicyItems());
Target target = new Target();
target.setType(TargetType.VM);
logger.info("results.getSpecification()=" + results.getSpecification());
} else {
// throw exception with error info
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Operation Policy validation problem: ControlLoopPolicyBuilder failed with following messages: ");
for (Message message : results.getMessages()) {
sb.append(message.getMessage());
}
throw new BadRequestException(sb.toString());
}
-
- String encodedYaml = URLEncoder.encode(results.getSpecification(), "UTF-8");
-
- return encodedYaml;
+ return URLEncoder.encode(results.getSpecification(), "UTF-8");
}
/**
builder.addResource(vfcResources);
// process each policy
- HashMap<String, Policy> policyObjMap = new HashMap<String, Policy>();
+ HashMap<String, Policy> policyObjMap = new HashMap<>();
List<PolicyItem> policyItemList = addAOTSActorRecipe(refProp, global.getService(),
policyChain.getPolicyItems());
Target target = new Target();
String policyName = policyItem.getRecipe() + " Policy";
if (i == 0) {
// To set up time window payload for trigger policy
- Map<String, String> payloadMap = new HashMap<String, String>();
+ Map<String, String> payloadMap = new HashMap<>();
payloadMap.put("timeWindow", refProp.getStringValue("op.eNodeB.timeWindow"));
String policyDescription = policyItem.getRecipe()
+ " Policy - the trigger (no parent) policy - created by CLDS";
logger.info("results.getSpecification()=" + results.getSpecification());
} else {
// throw exception with error info
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Operation Policy validation problem: ControlLoopPolicyBuilder failed with following messages: ");
for (Message message : results.getMessages()) {
sb.append(message.getMessage());
}
throw new BadRequestException(sb.toString());
}
-
- String encodedYaml = URLEncoder.encode(results.getSpecification(), "UTF-8");
-
- return encodedYaml;
+ return URLEncoder.encode(results.getSpecification(), "UTF-8");
}
/**
* @return
*/
private static List<PolicyItem> addAOTSActorRecipe(RefProp refProp, String service, List<PolicyItem> inOrigList) {
- List<PolicyItem> outList = new ArrayList<PolicyItem>();
+ List<PolicyItem> outList = new ArrayList<>();
try {
PolicyItem policyItem = inOrigList.get(0);
ObjectNode rootNode = (ObjectNode) refProp.getJsonTemplate("op.eNodeB.recipe", service);
policyItemObj.setRetryTimeLimit(Integer.parseInt(recipeNode.path("TimeLimit").asText()));
}
if (!recipeNode.path("PPConditions").asText().isEmpty()) {
- List<String> parentPolicyConditions = new ArrayList<String>();
+ List<String> parentPolicyConditions = new ArrayList<>();
for (String ppCondition : recipeNode.path("PPConditions").asText().split(",")) {
parentPolicyConditions.add(ppCondition);
}
// check for trigger policy (no parent)
String parent = inItem.getParentPolicy();
if (parent == null || parent.length() == 0) {
- if (outList.size() > 0) {
+ if (!outList.isEmpty()) {
throw new BadRequestException(
"Operation Policy validation problem: more than one trigger policy");
} else {
return new Resource[0];
}
return stringList.stream().map(stringElem -> new Resource(stringElem, resourceType)).toArray(Resource[]::new);
- }
+ }
/**
* Convert a List of policy result strings to an array of PolicyResult
String resourceInstanceName = "";
if (globalProps != null) {
List<String> resourceVf = globalProps.getResourceVf();
- if (resourceVf != null && resourceVf.size() > 0) {
+ if (resourceVf != null && !resourceVf.isEmpty()) {
resourceInstanceName = resourceVf.get(0);
}
if (globalProps.getService() != null) {
// TODO : refact and regroup with very similar code
List<String> urlList = new ArrayList<>();
try {
- Global globalProps = prop.getGlobal();
- if (globalProps != null) {
- if (globalProps.getService() != null) {
- String serviceInvariantUUID = globalProps.getService();
- execution.setVariable("serviceInvariantUUID", serviceInvariantUUID);
- List<String> resourceVfList = globalProps.getResourceVf();
- String serviceUUID = sdcCatalogServices.getServiceUuidFromServiceInvariantId(serviceInvariantUUID);
- String sdcServicesInformation = sdcCatalogServices.getSdcServicesInformation(serviceUUID);
- CldsSdcServiceDetail CldsSdcServiceDetail = sdcCatalogServices
- .getCldsSdcServiceDetailFromJson(sdcServicesInformation);
- if (CldsSdcServiceDetail != null && resourceVfList != null) {
- List<CldsSdcResource> CldsSdcResourcesList = CldsSdcServiceDetail.getResources();
- if (CldsSdcResourcesList != null && CldsSdcResourcesList.size() > 0) {
- for (CldsSdcResource CldsSdcResource : CldsSdcResourcesList) {
- if (CldsSdcResource != null && CldsSdcResource.getResoucreType() != null
- && CldsSdcResource.getResoucreType().equalsIgnoreCase("VF")) {
- if (resourceVfList.contains(CldsSdcResource.getResourceInvariantUUID())) {
- String normalizedResourceInstanceName = normalizeResourceInstanceName(
- CldsSdcResource.getResourceInstanceName());
- String svcUrl = baseUrl + "/" + serviceUUID + "/resourceInstances/"
- + normalizedResourceInstanceName + "/artifacts";
- urlList.add(svcUrl);
- }
+ Global globalProps = prop.getGlobal();
+ if (globalProps != null) {
+ if (globalProps.getService() != null) {
+ String serviceInvariantUUID = globalProps.getService();
+ execution.setVariable("serviceInvariantUUID", serviceInvariantUUID);
+ List<String> resourceVfList = globalProps.getResourceVf();
+ String serviceUUID = sdcCatalogServices.getServiceUuidFromServiceInvariantId(serviceInvariantUUID);
+ String sdcServicesInformation = sdcCatalogServices.getSdcServicesInformation(serviceUUID);
+ CldsSdcServiceDetail CldsSdcServiceDetail = sdcCatalogServices
+ .getCldsSdcServiceDetailFromJson(sdcServicesInformation);
+ if (CldsSdcServiceDetail != null && resourceVfList != null) {
+ List<CldsSdcResource> CldsSdcResourcesList = CldsSdcServiceDetail.getResources();
+ if (CldsSdcResourcesList != null && !CldsSdcResourcesList.isEmpty()) {
+ for (CldsSdcResource CldsSdcResource : CldsSdcResourcesList) {
+ if (CldsSdcResource != null && CldsSdcResource.getResoucreType() != null
+ && CldsSdcResource.getResoucreType().equalsIgnoreCase("VF")) {
+ if (resourceVfList.contains(CldsSdcResource.getResourceInvariantUUID())) {
+ String normalizedResourceInstanceName = normalizeResourceInstanceName(
+ CldsSdcResource.getResourceInstanceName());
+ String svcUrl = baseUrl + "/" + serviceUUID + "/resourceInstances/"
+ + normalizedResourceInstanceName + "/artifacts";
+ urlList.add(svcUrl);
}
}
}
}
}
}
+ }
} catch (IOException e) {
throw new SdcCommunicationException("Exception occurred during the SDC communication",e);
}
package org.onap.clamp.clds.dao;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import org.springframework.jdbc.core.simple.SimpleJdbcCall;
import org.springframework.stereotype.Repository;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
/**
* Data Access for CLDS Model tables.
*/
protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsDao.class);
protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
- private JdbcTemplate jdbcTemplateObject;
- private SimpleJdbcCall procGetModel;
- private SimpleJdbcCall procGetModelTemplate;
- private SimpleJdbcCall procSetModel;
- private SimpleJdbcCall procInsEvent;
- private SimpleJdbcCall procUpdEvent;
- private SimpleJdbcCall procSetTemplate;
- private SimpleJdbcCall procGetTemplate;
- private SimpleJdbcCall procDelAllModelInstances;
- private SimpleJdbcCall procInsModelInstance;
- private SimpleJdbcCall procDelModelInstance;
+ private JdbcTemplate jdbcTemplateObject;
+ private SimpleJdbcCall procGetModel;
+ private SimpleJdbcCall procGetModelTemplate;
+ private SimpleJdbcCall procSetModel;
+ private SimpleJdbcCall procInsEvent;
+ private SimpleJdbcCall procUpdEvent;
+ private SimpleJdbcCall procSetTemplate;
+ private SimpleJdbcCall procGetTemplate;
+ private SimpleJdbcCall procDelAllModelInstances;
+ private SimpleJdbcCall procInsModelInstance;
+ private SimpleJdbcCall procDelModelInstance;
- private static final String healthcheck = "Select 1";
+ private static final String HEALTHCHECK = "Select 1";
/**
* Log message when instantiating
cldsServiceData = (CldsServiceData) oip.readObject();
cldsServiceData.setAgeOfRecord(age);
} catch (IOException | ClassNotFoundException e) {
- logger.error("Error caught while retrieving cldsServiceData from database");
+ logger.error("Error caught while retrieving cldsServiceData from database", e);
}
return cldsServiceData;
}
return template;
}
- public CldsServiceData getCldsServiceCache(String invariantUUID)
- throws SQLException, IOException, ClassNotFoundException {
+ public CldsServiceData getCldsServiceCache(String invariantUUID) {
CldsServiceData cldsServiceData = null;
List<CldsServiceData> cldsServiceDataList = new ArrayList<>();
try {
return cldsServiceData;
}
- public void setCldsServiceCache(CldsDBServiceCache cldsDBServiceCache) throws SQLException, IOException {
+ public void setCldsServiceCache(CldsDBServiceCache cldsDBServiceCache) {
if (cldsDBServiceCache != null && cldsDBServiceCache.getInvariantId() != null
&& cldsDBServiceCache.getServiceId() != null) {
String invariantUuid = cldsDBServiceCache.getInvariantId();
}
public void doHealthCheck() throws SQLException, IOException {
- jdbcTemplateObject.execute(healthcheck);
+ jdbcTemplateObject.execute(HEALTHCHECK);
}
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.exception;
+
+/**
+ * New exception to CldsUser errors.
+ *
+ */
+public class CldsConfigException extends RuntimeException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5958873136187918505L;
+
+ /**
+ * This constructor can be used to create a new CldsConfigException.
+ *
+ * @param message
+ * A string message detailing the problem
+ * @param e
+ * The exception sent by the code
+ */
+ public CldsConfigException(String message, Throwable e) {
+ super(message, e);
+ }
+
+ /**
+ * This constructor can be used to create a new CldsConfigException. Use
+ * this constructor only if you are creating a new exception stack, not if
+ * an exception was already raised by another code.
+ *
+ * @param message
+ * A string message detailing the problem
+ */
+ public CldsConfigException(String message) {
+ super(message);
+ }
+
+}
this.serviceId = serviceId;
}
- public InputStream getCldsDataInstream() throws IOException {
+ public InputStream getCldsDataInstream() {
return cldsDataInstream;
}
package org.onap.clamp.clds.model;
-import java.math.BigDecimal;
-import java.util.List;
-
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.math.BigDecimal;
+import java.util.List;
+
@JsonIgnoreProperties(ignoreUnknown = true)
public class CldsSdcResource implements Comparable<CldsSdcResource> {
protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsSdcResource.class);
protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
- private String resourceInstanceName;
- private String resourceName;
- private String resourceInvariantUuid;
- private String resourceVersion;
- private String resoucreType;
- private String resourceUuid;
- private List<CldsSdcArtifact> artifacts;
+ private String resourceInstanceName;
+ private String resourceName;
+ private String resourceInvariantUuid;
+ private String resourceVersion;
+ private String resoucreType;
+ private String resourceUuid;
+ private List<CldsSdcArtifact> artifacts;
public String getResourceInstanceName() {
return resourceInstanceName;
return rtn;
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((resourceInstanceName == null) ? 0 : resourceInstanceName.hashCode());
+ result = prime * result + ((resourceVersion == null) ? 0 : resourceVersion.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ CldsSdcResource other = (CldsSdcResource) obj;
+ if (resourceInstanceName == null) {
+ if (other.resourceInstanceName != null)
+ return false;
+ } else if (!resourceInstanceName.equals(other.resourceInstanceName))
+ return false;
+ if (resourceVersion == null) {
+ if (other.resourceVersion != null)
+ return false;
+ } else if (!resourceVersion.equals(other.resourceVersion))
+ return false;
+ return true;
+ }
+
/**
* Convert version String into a BigDecimal
*
* @return
*/
private BigDecimal convertVersion(String versionText) {
- BigDecimal rtn = new BigDecimal(0.0);
+ BigDecimal rtn = BigDecimal.valueOf(0.0);
try {
rtn = new BigDecimal(versionText);
} catch (NumberFormatException nfe) {
package org.onap.clamp.clds.model;
-import java.math.BigDecimal;
-
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.math.BigDecimal;
+
@JsonIgnoreProperties(ignoreUnknown = true)
public class CldsSdcResourceBasicInfo implements Comparable<CldsSdcResourceBasicInfo> {
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsSdcResourceBasicInfo.class);
+ protected static final EELFLogger logger = EELFManager.getInstance()
+ .getLogger(CldsSdcResourceBasicInfo.class);
protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
- private String uuid;
- private String invariantUUID;
- private String name;
- private String version;
- private String toscaModelURL;
- private String category;
- private String subCategory;
- private String resourceType;
- private String lifecycleState;
- private String lastUpdaterUserId;
+ private String uuid;
+ private String invariantUUID;
+ private String name;
+ private String version;
+ private String toscaModelURL;
+ private String category;
+ private String subCategory;
+ private String resourceType;
+ private String lifecycleState;
+ private String lastUpdaterUserId;
@Override
public int compareTo(CldsSdcResourceBasicInfo in) {
return rtn;
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((version == null) ? 0 : version.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ CldsSdcResourceBasicInfo other = (CldsSdcResourceBasicInfo) obj;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ if (version == null) {
+ if (other.version != null)
+ return false;
+ } else if (!version.equals(other.version))
+ return false;
+ return true;
+ }
+
/**
* Convert version String into a BigDecimal
*
* @return
*/
private BigDecimal convertVersion(String version) {
- BigDecimal rtn = new BigDecimal(0.0);
+ BigDecimal rtn = BigDecimal.valueOf(0.0);
try {
rtn = new BigDecimal(version);
} catch (NumberFormatException nfe) {
package org.onap.clamp.clds.model;
-import java.math.BigDecimal;
-
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
+import java.math.BigDecimal;
+
public class CldsSdcServiceInfo implements Comparable<CldsSdcServiceInfo> {
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsSdcServiceInfo.class);
+ protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsSdcServiceInfo.class);
protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
- private String uuid;
- private String invariantUUID;
- private String name;
- private String version;
- private String toscaModelURL;
- private String category;
- private String lifecycleState;
- private String lastUpdaterUserId;
- private String distributionStatus;
+ private String uuid;
+ private String invariantUUID;
+ private String name;
+ private String version;
+ private String toscaModelURL;
+ private String category;
+ private String lifecycleState;
+ private String lastUpdaterUserId;
+ private String distributionStatus;
public String getUuid() {
return uuid;
return rtn;
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((version == null) ? 0 : version.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ CldsSdcServiceInfo other = (CldsSdcServiceInfo) obj;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ if (version == null) {
+ if (other.version != null)
+ return false;
+ } else if (!version.equals(other.version))
+ return false;
+ return true;
+ }
+
/**
* Convert version String into a BigDecimal
*
} catch (NumberFormatException nfe) {
logger.warn("SDC version=" + versionText + " is not decimal for name=" + name);
}
- return new BigDecimal(0.0);
+ return BigDecimal.valueOf(0.0);
}
}
package org.onap.clamp.clds.model;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.onap.clamp.clds.dao.CldsDao;
import org.onap.clamp.clds.service.CldsService;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
public class CldsServiceData implements Serializable {
- private static final long serialVersionUID = -9153372664377279423L;
+ private static final long serialVersionUID = -9153372664377279423L;
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsServiceData.class);
+ protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsServiceData.class);
protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
- private String serviceInvariantUUID;
- private String serviceUUID;
- private Long ageOfRecord;
- private List<CldsVfData> cldsVfs;
+ private String serviceInvariantUUID;
+ private String serviceUUID;
+ private Long ageOfRecord;
+ private List<CldsVfData> cldsVfs;
public String getServiceInvariantUUID() {
return serviceInvariantUUID;
this.serviceUUID = serviceUUID;
}
- public CldsServiceData getCldsServiceCache(CldsDao cldsDao, String invariantServiceUUID) throws Exception {
+ public CldsServiceData getCldsServiceCache(CldsDao cldsDao, String invariantServiceUUID) {
return cldsDao.getCldsServiceCache(invariantServiceUUID);
}
- public void setCldsServiceCache(CldsDao cldsDao, CldsDBServiceCache cldsDBServiceCache) throws Exception {
+ public void setCldsServiceCache(CldsDao cldsDao, CldsDBServiceCache cldsDBServiceCache) {
cldsDao.setCldsServiceCache(cldsDBServiceCache);
}
filteredCldsVfs.add(vf);
}
} catch (NotAuthorizedException e) {
- logger.debug("user not authorized for {}", vf.getVfInvariantResourceUUID());
+ logger.error("user not authorized for {}" + vf.getVfInvariantResourceUUID(), e);
// when not NotAuthorizedException - don't add to
// filteredCldsVfs list
}
package org.onap.clamp.clds.model.refprop;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* Holds reference properties.
*/
public class RefProp {
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(RefProp.class);
+ protected static final EELFLogger logger = EELFManager.getInstance().getLogger(RefProp.class);
protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
@Autowired
- private ApplicationContext appContext;
+ private ApplicationContext appContext;
- private Properties prop;
+ private Properties prop;
@Value("${org.onap.clamp.config.files.cldsReference:'classpath:/clds/clds-reference.properties'}")
- private String cldsReferenceValuesFile;
-
- /**
- * Load reference properties via null constructor
- *
- * @throws IOException
- */
- public RefProp() throws IOException {
- }
+ private String cldsReferenceValuesFile;
@PostConstruct
public void loadConfig() throws IOException {
package org.onap.clamp.clds.service;
import com.att.ajsc.common.AjscService;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.io.InputStream;
-import java.sql.SQLException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import org.apache.commons.lang3.StringUtils;
import org.camunda.bpm.engine.RuntimeService;
import org.camunda.bpm.engine.runtime.ProcessInstance;
+import org.json.simple.parser.ParseException;
import org.onap.clamp.clds.client.DcaeDispatcherServices;
import org.onap.clamp.clds.client.DcaeInventoryServices;
import org.onap.clamp.clds.client.SdcCatalogServices;
import org.onap.clamp.clds.dao.CldsDao;
+import org.onap.clamp.clds.exception.CldsConfigException;
+import org.onap.clamp.clds.exception.SdcCommunicationException;
import org.onap.clamp.clds.model.CldsDBServiceCache;
import org.onap.clamp.clds.model.CldsEvent;
import org.onap.clamp.clds.model.CldsHealthCheck;
* Service to save and retrieve the CLDS model attributes.
*/
@AjscService
-@Api(value = "/clds", description = "Clds operations")
+@Api(value = "/clds")
@Path("/clds")
public class CldsService extends SecureServiceBase {
@Autowired
- private ApplicationContext appContext;
+ private ApplicationContext appContext;
- private static final String RESOURCE_NAME = "clds-version.properties";
-
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsService.class);
- protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+ private static final String RESOURCE_NAME = "clds-version.properties";
@Value("${CLDS_PERMISSION_TYPE_CL:permission-type-cl}")
- private String cldsPersmissionTypeCl;
+ private String cldsPersmissionTypeCl;
@Value("${CLDS_PERMISSION_TYPE_CL_MANAGE:permission-type-cl-manage}")
- private String cldsPermissionTypeClManage;
+ private String cldsPermissionTypeClManage;
@Value("${CLDS_PERMISSION_TYPE_CL_EVENT:permission-type-cl-event}")
- private String cldsPermissionTypeClEvent;
+ private String cldsPermissionTypeClEvent;
@Value("${CLDS_PERMISSION_TYPE_FILTER_VF:permission-type-filter-vf}")
- private String cldsPermissionTypeFilterVf;
+ private String cldsPermissionTypeFilterVf;
@Value("${CLDS_PERMISSION_TYPE_TEMPLATE:permission-type-template}")
- private String cldsPermissionTypeTemplate;
+ private String cldsPermissionTypeTemplate;
@Value("${CLDS_PERMISSION_INSTANCE:dev}")
- private String cldsPermissionInstance;
+ private String cldsPermissionInstance;
- private SecureServicePermission permissionReadCl;
+ private SecureServicePermission permissionReadCl;
- private SecureServicePermission permissionUpdateCl;
+ private SecureServicePermission permissionUpdateCl;
- private SecureServicePermission permissionReadTemplate;
+ private SecureServicePermission permissionReadTemplate;
- private SecureServicePermission permissionUpdateTemplate;
+ private SecureServicePermission permissionUpdateTemplate;
@PostConstruct
private final void afterConstruction() {
// Get CLDS application version
String cldsVersion = "";
Properties props = new Properties();
- InputStream resourceStream = null;
- try {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- resourceStream = loader.getResourceAsStream(RESOURCE_NAME);
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ try (InputStream resourceStream = loader.getResourceAsStream(RESOURCE_NAME)) {
props.load(resourceStream);
cldsVersion = props.getProperty("clds.version");
} catch (Exception ex) {
- ex.printStackTrace();
- } finally {
- if (resourceStream != null) {
- try {
- resourceStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
+ logger.error("Exception caught during the clds.version reading", ex);
}
cldsInfo.setCldsVersion(cldsVersion);
cldsHealthCheck.setHealthCheckComponent("CLDS-APP");
cldsHealthCheck.setHealthCheckStatus("UP");
cldsHealthCheck.setDescription("OK");
- } catch (SQLException e) {
- logger.error("CLAMP application DB Error" + e);
- cldsHealthCheck.setHealthCheckComponent("CLDS-APP");
- cldsHealthCheck.setHealthCheckStatus("DOWN");
- cldsHealthCheck.setDescription("NOT-OK");
- // return Response.status(500).entity("Database down for CLDS
- // application").build();
} catch (Exception e) {
- logger.error("CLAMP application DB Error" + e);
+ logger.error("CLAMP application DB Error", e);
cldsHealthCheck.setHealthCheckComponent("CLDS-APP");
cldsHealthCheck.setHealthCheckStatus("DOWN");
cldsHealthCheck.setDescription("NOT-OK");
- // return Response.status(500).entity("Database down for CLDS
- // application").build();
}
-
return cldsHealthCheck;
}
*
* @param modelName
* @return clds model - clds model for the given model name
- * @throws NotAuthorizedException
*/
@ApiOperation(value = "Retrieves a CLDS model by name from the database", notes = "", response = String.class)
@GET
@Path("/model/{modelName}")
@Produces(MediaType.APPLICATION_JSON)
- public CldsModel getModel(@PathParam("modelName") String modelName) throws NotAuthorizedException {
+ public CldsModel getModel(@PathParam("modelName") String modelName) {
Date startTime = new Date();
LoggingUtils.setRequestContext("CldsService: GET model", getPrincipalName());
isAuthorized(permissionReadCl);
cldsModel.setUserAuthorizedToUpdate(isAuthorizedNoException(permissionUpdateCl));
/**
- * Checking condtion whether our CLDS model can call INventory Method
+ * Checking condition whether our CLDS model can call INventory Method
*/
if (cldsModel.canInventoryCall()) {
try {
* REST service that saves a CLDS model by name in the database.
*
* @param modelName
- * @throws TransformerException
- * @throws TransformerConfigurationException
*/
@ApiOperation(value = "Saves a CLDS model by name in the database", notes = "", response = String.class)
@PUT
@Path("/model/{modelName}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public CldsModel putModel(@PathParam("modelName") String modelName, CldsModel cldsModel)
- throws TransformerException {
+ public CldsModel putModel(@PathParam("modelName") String modelName, CldsModel cldsModel) {
Date startTime = new Date();
LoggingUtils.setRequestContext("CldsService: PUT model", getPrincipalName());
isAuthorized(permissionUpdateCl);
* @param test
* @param model
* @return
- * @throws Exception
- * @throws JsonProcessingException
- * @throws NotAuthorizedException
+ * @throws TransformerException
+ * @throws ParseException
*/
@ApiOperation(value = "Saves and processes an action for a CLDS model by name", notes = "", response = String.class)
@PUT
@Produces(MediaType.APPLICATION_JSON)
public CldsModel putModelAndProcessAction(@PathParam("action") String action,
@PathParam("modelName") String modelName, @QueryParam("test") String test, CldsModel model)
- throws Exception {
+ throws TransformerException, ParseException {
Date startTime = new Date();
LoggingUtils.setRequestContext("CldsService: Process model action", getPrincipalName());
String actionCd = action.toUpperCase();
@GET
@Path("/sdc/services")
@Produces(MediaType.APPLICATION_JSON)
- public String getSdcServices() throws Exception {
+ public String getSdcServices() {
Date startTime = new Date();
LoggingUtils.setRequestContext("CldsService: GET sdc services", getPrincipalName());
String retStr;
+
+ String responseStr = sdcCatalogServices.getSdcServicesInformation(null);
try {
- String responseStr = sdcCatalogServices.getSdcServicesInformation(null);
retStr = createUiServiceFormatJson(responseStr);
- } catch (Exception e) {
- logger.info("{} {}", e.getClass().getName(), e.getMessage());
- throw e;
+ } catch (IOException e) {
+ logger.error("IOException during SDC communication", e);
+ throw new SdcCommunicationException("IOException during SDC communication", e);
}
+
logger.info("value of sdcServices : {}", retStr);
// audit log
LoggingUtils.setTimeContext(startTime, new Date());
/**
* REST service that retrieves total properties required by UI
+ *
+ * @throws IOException
+ * In case of issues
*
- * @throws Exception
*/
@ApiOperation(value = "Retrieves total properties required by UI", notes = "", response = String.class)
@GET
@Path("/properties")
@Produces(MediaType.APPLICATION_JSON)
- public String getSdcProperties() throws Exception {
+ public String getSdcProperties() throws IOException {
return createPropertiesObjectByUUID(getGlobalCldsString(), "{}");
}
* @throws NotAuthorizedException
* @return
*/
- public boolean isAuthorizedForVf(String vfInvariantUuid) throws NotAuthorizedException {
- if (cldsPermissionTypeFilterVf != null && cldsPermissionTypeFilterVf.length() > 0) {
+ public boolean isAuthorizedForVf(String vfInvariantUuid) {
+ if (cldsPermissionTypeFilterVf != null && !cldsPermissionTypeFilterVf.isEmpty()) {
SecureServicePermission permission = SecureServicePermission.create(cldsPermissionTypeFilterVf,
cldsPermissionInstance, vfInvariantUuid);
return isAuthorized(permission);
* @param model
* @return
*/
- private boolean isAuthorizedForVf(CldsModel model) throws NotAuthorizedException {
+ private boolean isAuthorizedForVf(CldsModel model) {
String vf = ModelProperties.getVf(model);
if (vf == null || vf.length() == 0) {
logger.info("VF not found in model");
ObjectNode invariantIdServiceNode = objectMapper.createObjectNode();
ObjectNode serviceNode = objectMapper.createObjectNode();
logger.info("value of cldsserviceiNfolist: {}", rawList);
- if (rawList != null && rawList.size() > 0) {
+ if (rawList != null && !rawList.isEmpty()) {
List<CldsSdcServiceInfo> cldsSdcServiceInfoList = sdcCatalogServices.removeDuplicateServices(rawList);
for (CldsSdcServiceInfo currCldsSdcServiceInfo : cldsSdcServiceInfoList) {
}
private void createVfObjectNode(ObjectNode vfObjectNode2, ObjectMapper mapper,
- List<CldsSdcResource> rawCldsSdcResourceList) throws IOException {
+ List<CldsSdcResource> rawCldsSdcResourceList) {
ObjectNode vfNode = mapper.createObjectNode();
vfNode.put("", "");
- // To remove repeated resource instance name from resourceInstanceList
+ // To remove repeated resource instance name from
+ // resourceInstanceList
List<CldsSdcResource> cldsSdcResourceList = sdcCatalogServices
.removeDuplicateSdcResourceInstances(rawCldsSdcResourceList);
/**
* Creating vf resource node using cldsSdcResource Object
*/
- if (cldsSdcResourceList != null && cldsSdcResourceList.size() > 0) {
+ if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) {
for (CldsSdcResource cldsSdcResource : cldsSdcResourceList) {
- if (cldsSdcResource != null && cldsSdcResource.getResoucreType() != null
- && cldsSdcResource.getResoucreType().equalsIgnoreCase("VF")) {
+ if (cldsSdcResource != null && "VF".equalsIgnoreCase(cldsSdcResource.getResoucreType())) {
vfNode.put(cldsSdcResource.getResourceUUID(), cldsSdcResource.getResourceName());
}
}
}
vfObjectNode2.putPOJO("vf", vfNode);
- String locationStringValue = refProp.getStringValue("ui.location.default");
- String alarmStringValue = refProp.getStringValue("ui.alarm.default");
/**
* creating location json object using properties file value
*/
- ObjectNode locationJsonNode = (ObjectNode) mapper.readValue(locationStringValue, JsonNode.class);
+ 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 = (ObjectNode) mapper.readValue(alarmStringValue, JsonNode.class);
+ 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(ObjectMapper mapper, List<CldsSdcResource> cldsSdcResourceList) {
vfCObjectNode.putPOJO("vfC", emptyObjectNode);
ObjectNode subVfCObjectNode = mapper.createObjectNode();
subVfCObjectNode.putPOJO("vfc", emptyObjectNode);
- if (cldsSdcResourceList != null && cldsSdcResourceList.size() > 0) {
+ if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) {
for (CldsSdcResource cldsSdcResource : cldsSdcResourceList) {
- if (cldsSdcResource != null && cldsSdcResource.getResoucreType() != null
- && cldsSdcResource.getResoucreType().equalsIgnoreCase("VF")) {
+ if (cldsSdcResource != null && "VF".equalsIgnoreCase(cldsSdcResource.getResoucreType())) {
vfCObjectNode.putPOJO(cldsSdcResource.getResourceUUID(), subVfCObjectNode);
}
}
model.getTypeId());
String operationStatus = "processing";
long waitingTime = System.nanoTime() + TimeUnit.MINUTES.toNanos(10);
- while (operationStatus.equalsIgnoreCase("processing")) {
+ while ("processing".equalsIgnoreCase(operationStatus)) {
// Break the loop if waiting for more than 10 mins
if (waitingTime < System.nanoTime()) {
break;
}
operationStatus = dcaeDispatcherServices.getOperationStatus(createNewDeploymentStatusUrl);
}
- if (operationStatus.equalsIgnoreCase("succeeded")) {
+ if ("succeeded".equalsIgnoreCase(operationStatus)) {
String artifactName = model.getControlName();
if (artifactName != null) {
artifactName = artifactName + ".yml";
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public CldsModel unDeployModel(@PathParam("action") String action, @PathParam("modelName") String modelName,
- @QueryParam("test") String test, CldsModel model) throws Exception {
+ @QueryParam("test") String test, CldsModel model) throws IOException {
Date startTime = new Date();
LoggingUtils.setRequestContext("CldsService: Undeploy model", getPrincipalName());
String operationStatusUndeployUrl = dcaeDispatcherServices.deleteExistingDeployment(model.getDeploymentId(),
model.getTypeId());
String operationStatus = "processing";
long waitingTime = System.nanoTime() + TimeUnit.MINUTES.toNanos(10);
- while (operationStatus.equalsIgnoreCase("processing")) {
+ while ("processing".equalsIgnoreCase(operationStatus)) {
if (waitingTime < System.nanoTime()) {
break;
}
operationStatus = dcaeDispatcherServices.getOperationStatus(operationStatusUndeployUrl);
}
- if (operationStatus.equalsIgnoreCase("succeeded")) {
+ if ("succeeded".equalsIgnoreCase(operationStatus)) {
String artifactName = model.getControlName();
if (artifactName != null) {
artifactName = artifactName + ".yml";
return model;
}
- private String getGlobalCldsString() throws Exception {
- if (null == globalCldsProperties) {
- globalCldsProperties = new Properties();
- globalCldsProperties.load(appContext.getResource(globalClds).getInputStream());
+ private String getGlobalCldsString() {
+ try {
+ if (null == globalCldsProperties) {
+ globalCldsProperties = new Properties();
+ globalCldsProperties.load(appContext.getResource(globalClds).getInputStream());
+ }
+ return (String) globalCldsProperties.get("globalCldsProps");
+ } catch (IOException e) {
+ logger.error("Unable to load the globalClds due to an exception", e);
+ throw new CldsConfigException("Unable to load the globalClds due to an exception", e);
}
- return (String) globalCldsProperties.get("globalCldsProps");
}
}
package org.onap.clamp.clds.service;
+import com.att.ajsc.common.AjscService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import com.att.ajsc.common.AjscService;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
/**
* Service to save and retrieve the CLDS model attributes.
*/
@Path("/cldsTempate")
public class CldsTemplateService extends SecureServiceBase {
- protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsTemplateService.class);
- protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
-
- private static final String collectorKey = "Collector";
- private static final String stringMatchKey = "StringMatch";
- private static final String policyKey = "Policy";
+ private static final String COLLECTOR_KEY = "Collector";
+ private static final String STRING_MATCH_KEY = "StringMatch";
+ private static final String POLICY_KEY = "Policy";
@Value("${CLDS_PERMISSION_TYPE_TEMPLATE:permission-type-template}")
private String cldsPermissionTypeTemplate;
logger.info("value of elementIds:" + bpmnElementIds);
logger.info("value of prop text:" + propText);
Map<String, String> bpmnIoIdsMap = new HashMap<>();
- if (bpmnElementIds != null && bpmnElementIds.size() > 0) {
+ if (bpmnElementIds != null && !bpmnElementIds.isEmpty()) {
ObjectMapper objectMapper = new ObjectMapper();
ObjectNode root = objectMapper.readValue(propText, ObjectNode.class);
Iterator<Entry<String, JsonNode>> entryItr = root.fields();
ObjectNode node = (ObjectNode) anArrayNode;
String valueNode = node.get("value").asText();
logger.info("value of node:" + valueNode);
- if (keyPropName.startsWith(collectorKey)) {
- valueNode = collectorKey + "_" + valueNode;
- } else if (keyPropName.startsWith(stringMatchKey)) {
- valueNode = stringMatchKey + "_" + valueNode;
- } else if (keyPropName.startsWith(policyKey)) {
- valueNode = policyKey + "_" + valueNode;
+ if (keyPropName.startsWith(COLLECTOR_KEY)) {
+ valueNode = COLLECTOR_KEY + "_" + valueNode;
+ } else if (keyPropName.startsWith(STRING_MATCH_KEY)) {
+ valueNode = STRING_MATCH_KEY + "_" + valueNode;
+ } else if (keyPropName.startsWith(POLICY_KEY)) {
+ valueNode = POLICY_KEY + "_" + valueNode;
}
bpmnIoIdsMap.put(keyPropName, valueNode);
}
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.onap.clamp.clds.transform;
+package org.onap.clamp.clds.util;
import java.io.IOException;
import java.io.InputStream;
/**
* Utility methods supporting transforms.
*/
-public class TransformUtil {
+public class ResourceFileUtil {
+
+ /**
+ * Disable the ResourceFileUtil constructor.
+ */
+ private ResourceFileUtil() {
+
+ }
/**
* Return resource as a Stream.
import org.onap.clamp.clds.client.req.DcaeReq;
import org.onap.clamp.clds.model.CldsEvent;
import org.onap.clamp.clds.model.prop.ModelProperties;
-import org.onap.clamp.clds.transform.TransformUtil;
-
+import org.onap.clamp.clds.util.ResourceFileUtil;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.test.context.junit4.SpringRunner;
@Test
public void testDcaeReq() throws Exception {
- String modelProp = TransformUtil.getResourceAsString("example/modelProp.json");
- String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnProp.json");
+ String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
+ String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
String modelName = "example-model";
String controlName = "ClosedLoop-FRWL-SIG-1582f840-2881-11e6-b4ec-005056a9d756";
import org.onap.clamp.clds.model.prop.PolicyChain;
import org.onap.clamp.clds.model.prop.StringMatch;
import org.onap.clamp.clds.model.prop.Tca;
-import org.onap.clamp.clds.transform.TransformUtil;
+import org.onap.clamp.clds.util.ResourceFileUtil;
import org.onap.policy.api.AttributeType;
import org.skyscreamer.jsonassert.JSONAssert;
import org.springframework.boot.test.context.SpringBootTest;
String modelName;
String controlName;
-
/**
- * Initialize Test.
- */
+ * Initialize Test.
+ */
@Before
public void setUp() throws IOException {
- modelProp = TransformUtil.getResourceAsString("example/modelProp.json");
- modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnProp.json");
+ modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
+ modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
modelName = "example-model06";
controlName = "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf";
}
String stringMatchPolicyRequestUuid = UUID.randomUUID().toString();
String policyJson = StringMatchPolicyReq.format(refProp, prop);
- String correctValue = TransformUtil.getResourceAsString("expected/stringmatch.json");
+ String correctValue = ResourceFileUtil.getResourceAsString("expected/stringmatch.json");
JSONAssert.assertEquals(policyJson, correctValue, true);
String responseMessage = "";
try {
- responseMessage = policyClient.sendMicroService(policyJson, prop, stringMatchPolicyRequestUuid);
+ responseMessage = policyClient.sendMicroServiceInJson(policyJson, prop, stringMatchPolicyRequestUuid);
} catch (Exception e) {
assertTrue(e.getMessage().contains("Policy send failed: PE500 "));
}
Map<AttributeType, Map<String, String>> attributes = OperationalPolicyReq.formatAttributes(refProp,
prop, policy.getId(), policyChain);
- String responseMessage = policyClient.sendBrms(attributes, prop, operationalPolicyRequestUuid);
+ String responseMessage = policyClient.sendBrmsPolicy(attributes, prop, operationalPolicyRequestUuid);
System.out.println(responseMessage);
}
}
private void createUpdateTcaPolicy(String actionCd) throws Exception {
ModelProperties prop = new ModelProperties(modelName, controlName, actionCd, false, modelBpmnProp, modelProp);
- Tca tca = prop.getTca();
+ Tca tca = prop.getType(Tca.class);
if (tca.isFound()) {
String tcaPolicyRequestUuid = UUID.randomUUID().toString();
String policyJson = TcaMPolicyReq.formatTca(refProp, prop);
- String correctValue = TransformUtil.getResourceAsString("expected/tca.json");
+ String correctValue = ResourceFileUtil.getResourceAsString("expected/tca.json");
JSONAssert.assertEquals(policyJson, correctValue, true);
String responseMessage = "";
try {
- responseMessage = policyClient.sendMicroService(policyJson, prop, tcaPolicyRequestUuid);
+ responseMessage = policyClient.sendMicroServiceInJson(policyJson, prop, tcaPolicyRequestUuid);
} catch (Exception e) {
assertTrue(e.getMessage().contains("Policy send failed: PE500 "));
}
private void deleteTcaPolicy(String actionCd) throws Exception {
ModelProperties prop = new ModelProperties(modelName, controlName, actionCd, false, modelBpmnProp, modelProp);
- Tca tca = prop.getTca();
+ Tca tca = prop.getType(Tca.class);
if (tca.isFound()) {
prop.setCurrentModelElementId(tca.getId());
String responseMessage = "";
import org.onap.clamp.clds.model.CldsEvent;
import org.onap.clamp.clds.model.prop.ModelProperties;
import org.onap.clamp.clds.model.refprop.RefProp;
-import org.onap.clamp.clds.transform.TransformUtil;
-
+import org.onap.clamp.clds.util.ResourceFileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@Test
public void testBlueprint() throws Exception {
- String modelProp = TransformUtil.getResourceAsString("example/modelProp.json");
- String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnProp.json");
+ String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
+ String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
String modelName = "example-model06";
String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756";
- String docText = TransformUtil.getResourceAsString("example/templateProp.json");
+ String docText = ResourceFileUtil.getResourceAsString("example/templateProp.json");
ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT,
true, modelBpmnProp, modelProp);
String blueprint = SdcReq.formatBlueprint(refProp, prop, docText);
@Test
public void testTcaBlueprint() throws Exception {
- String modelProp = TransformUtil.getResourceAsString("example/modelPropForPolicy.json");
- String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnPropForPolicy.json");
+ String modelProp = ResourceFileUtil.getResourceAsString("example/modelPropForPolicy.json");
+ String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnPropForPolicy.json");
String modelName = "example-model06";
String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756";
- String docText = TransformUtil.getResourceAsString("example/templatePropForTca.json");
+ String docText = ResourceFileUtil.getResourceAsString("example/templatePropForTca.json");
ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT,
true, modelBpmnProp, modelProp);
String blueprint = SdcReq.formatBlueprint(refProp, prop, docText);
\r
import org.junit.Assert;\r
import org.junit.Test;\r
-import org.onap.clamp.clds.transform.TransformUtil;\r
+import org.onap.clamp.clds.util.ResourceFileUtil;\r
\r
public class CustomModelElementTest {\r
\r
public void testNewElement() {\r
\r
try {\r
- String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnProp.json");\r
- String modelProp = TransformUtil.getResourceAsString("example/modelProp.json");\r
+ String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");\r
+ String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");\r
String modName = "example-model-name";\r
String controlName = "example-control-name";\r
\r
import org.junit.Assert;
import org.junit.Test;
-
-import org.onap.clamp.clds.transform.TransformUtil;
+import org.onap.clamp.clds.util.ResourceFileUtil;
/**
@Test
public void testJsonParse() throws IOException {
- String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnProp.json");
- String modelProp = TransformUtil.getResourceAsString("example/modelProp.json");
+ String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
+ String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
String modName = "example-model-name";
String controlName = "example-control-name";
@Test
public void testPolicy() throws IOException {
- String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnPropForPolicy.json");
+ String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnPropForPolicy.json");
System.out.println(modelBpmnProp);
- String modelProp = TransformUtil.getResourceAsString("example/modelPropForPolicy.json");
+ String modelProp = ResourceFileUtil.getResourceAsString("example/modelPropForPolicy.json");
System.out.println(modelProp);
ModelProperties prop = new ModelProperties("example-model-name", "example-control-name",
null, true, modelBpmnProp, modelProp);
Code Review / clamp.git / commitdiff