-# OpenECOMP SDC-Tosca
+# ONAP SDC-Tosca
---
# Introduction
-OpenECOMP SDC-Tosca is delivered as helper JAR that can be used by clients that work with SDC TOSCA CSAR files.
+ONAP SDC-Tosca is delivered as helper JAR that can be used by clients that work with SDC TOSCA CSAR files.
It parses the CSAR and returns the model object which represents the CSAR contents, through designated function calls with SDC flavour.
It uses the underlying generic JTOSCA parser.
-# Compiling OpenECOMP JTOSCA
+# Compiling ONAP JTOSCA
-OpenECOMP SDC-Tosca can be compiled easily using maven command: `mvn clean install`
+ONAP SDC-Tosca can be compiled easily using maven command: `mvn clean install`
The result is JAR file under "target" folder
# Getting Help
*** to be completed on release ***
-SDC@lists.openecomp.org
+SDC@lists.onap.org
SDC Javadoc and Maven site
\r
<modelVersion>4.0.0</modelVersion>\r
\r
- <groupId>org.openecomp.sdc.sdc-tosca</groupId>\r
+ <groupId>org.onap.sdc.sdc-tosca</groupId>\r
<artifactId>sdc-tosca</artifactId>\r
<name>sdc-sdc-tosca</name>\r
<description>SDC Tosca Parser JAR file for use by consumers</description>\r
- <version>1.2.3-SNAPSHOT</version>\r
+ <version>1.3.0-SNAPSHOT</version>\r
<packaging>jar</packaging>\r
\r
<properties>\r
<!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->\r
<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>\r
<nexus.proxy>https://nexus.onap.org</nexus.proxy>\r
- <sitePath>/content/sites/site/org/openecomp/sdc/sdc-tosca/${project.version}</sitePath>\r
+ <sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>\r
<snapshots.path>snapshots</snapshots.path>\r
<releases.path>releases</releases.path>\r
<staging.profile.id>176c31dfe190a</staging.profile.id>\r
\r
<!-- jtosca Tosca Parser -->\r
<dependency>\r
- <groupId>org.openecomp.sdc.jtosca</groupId>\r
+ <groupId>org.onap.sdc.jtosca</groupId>\r
<artifactId>jtosca</artifactId>\r
- <version>1.2.2-SNAPSHOT</version>\r
+ <version>1.3.0</version>\r
</dependency>\r
\r
\r
-package org.openecomp.sdc.tosca.parser.api;
+package org.onap.sdc.tosca.parser.api;
public class ConformanceLevel {
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.tosca.parser.api;
+package org.onap.sdc.tosca.parser.api;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.sdc.tosca.parser.impl.FilterType;
-import org.openecomp.sdc.tosca.parser.impl.SdcTypes;
-import org.openecomp.sdc.toscaparser.api.*;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
-import org.openecomp.sdc.toscaparser.api.parameters.Input;
+import org.onap.sdc.tosca.parser.impl.SdcTypes;
+import org.onap.sdc.tosca.parser.impl.FilterType;
+import org.onap.sdc.toscaparser.api.*;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.toscaparser.api.parameters.Input;
public interface ISdcCsarHelper {
public List<NodeTemplate> getServiceNodeTemplates();
/**
- * Get groups of a VF with type "org.openecomp.groups.VfModule".
+ * Get groups of a VF with type "org.onap.groups.VfModule".
*
* @param vfCustomizationUuid - customizationUuid of VF instance.
* @return list of vfModule groups.
* For the below:<br><br>
*
* substitution_mappings:<br>
- type: org.openecomp.services.ViprATM<br>
+ type: org.onap.services.ViprATM<br>
calling<br>
getServiceSubstitutionMappingsTypeName()<br>
- will return "org.openecomp.services.ViprATM"
+ will return "org.onap.services.ViprATM"
* @return - the type name of the CSAR service's substitution mappings element
*/
public String getServiceSubstitutionMappingsTypeName();
* For example, for this group definition:<br><br>
*
* ViprAtm..vIPR-ATM-Base..module-0:<br>
- type: org.openecomp.groups.VfModule<br>
+ type: org.onap.groups.VfModule<br>
.................<br>
members: [vIPR_ATM_Ha_Two, vIPR_ATM_Ha_One, vIPR_ATM_OAM_SG, vIPR_ATM_HA_TWO_SG, vIPR_ATM_HA_ONE_SG]<br><br>
* For example, if we have the below two node templates in the vIPR VF:<br><br>
*
* oam_extCP:<br>
- type: org.openecomp.resources.cp.extCP<br>
+ type: org.onap.resources.cp.extCP<br>
requirements:<br>
- virtualBinding: vipr_atm_firewall<br><br>
*
* vipr_atm_firewall: <br>
- type: org.openecomp.resources.vfc.ViprAtm.abstract.nodes.heat.vipr_atm<br>
+ type: org.onap.resources.vfc.ViprAtm.abstract.nodes.heat.vipr_atm<br>
........<br><br>
*
* For this node template:<br>
*
* vipr_atm_firewall: <br>
- type: org.openecomp.resources.vfc.ViprAtm.abstract.nodes.heat.vipr_atm<br>
+ type: org.onap.resources.vfc.ViprAtm.abstract.nodes.heat.vipr_atm<br>
........<br><br>
*
- * the function will return "org.openecomp.resources.vfc.ViprAtm.abstract.nodes.heat.vipr_atm"
+ * the function will return "org.onap.resources.vfc.ViprAtm.abstract.nodes.heat.vipr_atm"
*
* @param nodeTemplate - node template object
* @return - node type string.
-package org.openecomp.sdc.tosca.parser.api;
+package org.onap.sdc.tosca.parser.api;
public class Version implements Comparable<Version> {
-package org.openecomp.sdc.tosca.parser.config;
+package org.onap.sdc.tosca.parser.config;
-import org.openecomp.sdc.tosca.parser.api.ConformanceLevel;
+import org.onap.sdc.tosca.parser.api.ConformanceLevel;
public class Configuration {
-package org.openecomp.sdc.tosca.parser.config;
+package org.onap.sdc.tosca.parser.config;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
-import org.openecomp.sdc.tosca.parser.utils.YamlToObjectConverter;
+import org.onap.sdc.tosca.parser.utils.YamlToObjectConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.tosca.parser.config;
+package org.onap.sdc.tosca.parser.config;
import java.util.Map;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.tosca.parser.config;
+package org.onap.sdc.tosca.parser.config;
public class ErrorInfo {
-package org.openecomp.sdc.tosca.parser.config;
+package org.onap.sdc.tosca.parser.config;
public class JToscaValidationIssueInfo {
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.tosca.parser.config;
+package org.onap.sdc.tosca.parser.config;
import java.util.ArrayList;
import java.util.List;
-package org.openecomp.sdc.tosca.parser.config;
+package org.onap.sdc.tosca.parser.config;
import java.util.EnumMap;
import java.util.Map;
-import org.openecomp.sdc.toscaparser.api.utils.JToscaErrorCodes;
+import org.onap.sdc.toscaparser.api.utils.JToscaErrorCodes;
public enum SdcToscaParserErrors {
-package org.openecomp.sdc.tosca.parser.exceptions;\r
-\r
-public class SdcToscaParserException extends Exception {\r
-\r
- private static final long serialVersionUID = 626014844866501196L;\r
- private String code;\r
-\r
- public SdcToscaParserException(String string, String code) {\r
- super(string);\r
- this.code = code;\r
- }\r
-\r
- public String getCode() {\r
- return code;\r
- }\r
-\r
- public void setCode(String code) {\r
- this.code = code;\r
- }\r
-}\r
+package org.onap.sdc.tosca.parser.exceptions;
+
+public class SdcToscaParserException extends Exception {
+
+ private static final long serialVersionUID = 626014844866501196L;
+ private String code;
+
+ public SdcToscaParserException(String string, String code) {
+ super(string);
+ this.code = code;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+}
-package org.openecomp.sdc.tosca.parser.impl;
+package org.onap.sdc.tosca.parser.impl;
public enum FilterType {
-package org.openecomp.sdc.tosca.parser.impl;
+package org.onap.sdc.tosca.parser.impl;
public enum JToscaValidationIssueType {
CRITICAL,
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.tosca.parser.impl;
+package org.onap.sdc.tosca.parser.impl;
import java.util.*;
import java.util.Map.Entry;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignments;
-import org.openecomp.sdc.tosca.parser.utils.GeneralUtility;
-import org.openecomp.sdc.toscaparser.api.RequirementAssignments;
-import org.openecomp.sdc.tosca.parser.utils.SdcToscaUtility;
-import org.openecomp.sdc.toscaparser.api.*;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
-import org.openecomp.sdc.toscaparser.api.elements.NodeType;
-import org.openecomp.sdc.toscaparser.api.functions.Function;
-import org.openecomp.sdc.toscaparser.api.parameters.Input;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.config.ConfigurationManager;
+import org.onap.sdc.tosca.parser.utils.GeneralUtility;
+import org.onap.sdc.tosca.parser.utils.SdcToscaUtility;
+import org.onap.sdc.toscaparser.api.*;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.toscaparser.api.elements.NodeType;
+import org.onap.sdc.toscaparser.api.functions.Function;
+import org.onap.sdc.toscaparser.api.parameters.Input;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID;
-
public class SdcCsarHelperImpl implements ISdcCsarHelper {
private static final String PATH_DELIMITER = "#";
//Assumed to be unique property for the list
private NodeTemplate getNodeTemplateByCustomizationUuid(List<NodeTemplate> nodeTemplates, String customizationId) {
if (customizationId != null) {
- Optional<NodeTemplate> findFirst = nodeTemplates.stream().filter(x -> (x.getMetaData() != null && customizationId.equals(x.getMetaData().getValue(PROPERTY_NAME_CUSTOMIZATIONUUID)))).findFirst();
+ Optional<NodeTemplate> findFirst = nodeTemplates.stream().filter(x -> (x.getMetaData() != null && customizationId.equals(x.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)))).findFirst();
return findFirst.isPresent() ? findFirst.get() : null;
}
else {
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.tosca.parser.impl;
+package org.onap.sdc.tosca.parser.impl;
public class SdcPropertyNames {
public static String PROPERTY_NAME_INVARIANTUUID = "invariantUUID";
-package org.openecomp.sdc.tosca.parser.impl;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import org.openecomp.sdc.tosca.parser.api.ConformanceLevel;\r
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;\r
-import org.openecomp.sdc.tosca.parser.config.*;\r
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;\r
-import org.openecomp.sdc.tosca.parser.utils.GeneralUtility;\r
-import org.openecomp.sdc.toscaparser.api.ToscaTemplate;\r
-import org.openecomp.sdc.toscaparser.api.common.JToscaValidationIssue;\r
-import org.openecomp.sdc.toscaparser.api.common.JToscaException;\r
-import org.openecomp.sdc.toscaparser.api.utils.JToscaErrorCodes;\r
-import org.openecomp.sdc.toscaparser.api.utils.ThreadLocalsHolder;\r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\r
-\r
-public class SdcToscaParserFactory {\r
- private static Logger log = LoggerFactory.getLogger(SdcToscaParserFactory.class.getName());\r
-\r
- private static ConfigurationManager configurationManager;\r
- private static volatile SdcToscaParserFactory instance;\r
- private List<JToscaValidationIssue> criticalExceptions = new ArrayList<>();\r
- private List<JToscaValidationIssue> warningExceptions = new ArrayList<>();\r
- private List<JToscaValidationIssue> notAnalyzadExceptions = new ArrayList<>();\r
- private SdcToscaParserFactory() {}\r
-\r
- /**\r
- * Get an SdcToscaParserFactory instance.\r
- * @return SdcToscaParserFactory instance.\r
- */\r
- public static SdcToscaParserFactory getInstance() {\r
- if (instance == null) {\r
- synchronized (SdcToscaParserFactory.class) {\r
- if (instance == null) {\r
- instance = new SdcToscaParserFactory();\r
- configurationManager = ConfigurationManager.getInstance();\r
- }\r
- }\r
- }\r
- return instance;\r
- }\r
-\r
- public static void setConfigurationManager(ConfigurationManager configurationManager) {\r
- SdcToscaParserFactory.configurationManager = configurationManager;\r
- }\r
-\r
- /**\r
- * Get an ISdcCsarHelper object for this CSAR file.\r
- *\r
- * @param csarPath - the absolute path to CSAR file.\r
- * @return ISdcCsarHelper object.\r
- * @throws SdcToscaParserException - in case the path or CSAR are invalid.\r
- */\r
- public ISdcCsarHelper getSdcCsarHelper(String csarPath) throws SdcToscaParserException {\r
- return init(csarPath, true);\r
- }\r
-\r
- /**\r
- * Get an ISdcCsarHelper object for this CSAR file.\r
- *\r
- * @param csarPath - the absolute path to CSAR file.\r
- * @param resolveGetInput - resolve get_input properties\r
- * @return ISdcCsarHelper object.\r
- * @throws SdcToscaParserException - in case the path or CSAR are invalid.\r
- */\r
- public ISdcCsarHelper getSdcCsarHelper(String csarPath, boolean resolveGetInput) throws SdcToscaParserException {\r
- return init(csarPath, resolveGetInput);\r
- }\r
-\r
- private ISdcCsarHelper init(String csarPath, boolean resolveGetInput) throws SdcToscaParserException {\r
- synchronized (SdcToscaParserFactory.class) {\r
- ToscaTemplate tosca = null;\r
- try {\r
- tosca = new ToscaTemplate(csarPath, null, true, null, resolveGetInput);\r
- } catch (JToscaException e) {\r
- throwSdcToscaParserException(e);\r
- }\r
- SdcCsarHelperImpl sdcCsarHelperImpl = new SdcCsarHelperImpl(tosca, configurationManager);\r
- String cSarConformanceLevel = sdcCsarHelperImpl.getConformanceLevel();\r
- validateCsarVersion(cSarConformanceLevel);\r
- try {\r
- handleErrorsByTypes(csarPath, cSarConformanceLevel);\r
- } catch (JToscaException e) {\r
- throwSdcToscaParserException(e);\r
- }\r
- return sdcCsarHelperImpl;\r
- }\r
- }\r
-\r
- private void handleErrorsByTypes(String csarPath, String cSarConformanceLevel) throws JToscaException {\r
- clearValidationIssuesLists();\r
- for(JToscaValidationIssue toscaValidationIssue : ThreadLocalsHolder.getCollector().getValidationIssues().values()){\r
- List<JToscaValidationIssueInfo> issueInfos = configurationManager.getJtoscaValidationIssueConfiguration().getValidationIssues().get(toscaValidationIssue.getCode());\r
- if(issueInfos != null && !issueInfos.isEmpty()){\r
- JToscaValidationIssueInfo issueInfo = null;\r
- issueInfo = issueInfos.stream()\r
- .filter(i-> isMatchConformanceLevel(cSarConformanceLevel,i.getSinceCsarConformanceLevel()))\r
- .max((i1,i2) -> GeneralUtility.conformanceLevelCompare(i1.getSinceCsarConformanceLevel(), i2.getSinceCsarConformanceLevel()) )\r
- .orElse(null);\r
-\r
- if(issueInfo != null){\r
- switch (JToscaValidationIssueType.valueOf(issueInfo.getIssueType())) {\r
- case CRITICAL:\r
- criticalExceptions.add(toscaValidationIssue);\r
- break;\r
- case WARNING:\r
- warningExceptions.add(toscaValidationIssue);\r
- break;\r
- default:\r
- break;\r
- }\r
- }else{\r
- notAnalyzadExceptions.add(toscaValidationIssue);\r
- }\r
- }else{//notAnalyzed\r
- notAnalyzadExceptions.add(toscaValidationIssue);\r
- }\r
- }\r
- logErrors(csarPath);\r
- }\r
-\r
- private void clearValidationIssuesLists(){\r
- notAnalyzadExceptions.clear();\r
- criticalExceptions.clear();\r
- warningExceptions.clear();\r
- }\r
-\r
- private void logErrors(String inputPath) throws JToscaException{\r
- //Warnings\r
- int warningsCount = warningExceptions.size();\r
- if (warningsCount > 0) {\r
- log.warn("####################################################################################################");\r
- log.warn("CSAR Warnings found! CSAR name - {}", inputPath);\r
- log.warn("ToscaTemplate - verifyTemplate - {} Parsing Warning{} occurred...", warningsCount, (warningsCount > 1 ? "s" : ""));\r
- for (JToscaValidationIssue info : warningExceptions) {\r
- log.warn("JTosca Exception [{}]: {}. CSAR name - {}", info.getCode(),info.getMessage(), inputPath);\r
- }\r
- log.warn("####################################################################################################");\r
- }\r
- //Criticals\r
- int criticalsCount = criticalExceptions.size();\r
- if (criticalsCount > 0) {\r
- log.error("####################################################################################################");\r
- log.error("ToscaTemplate - verifyTemplate - {} Parsing Critical{} occurred...", criticalsCount, (criticalsCount > 1 ? "s" : ""));\r
- for (JToscaValidationIssue info : criticalExceptions) {\r
- log.error("JTosca Exception [{}]: {}. CSAR name - {}", info.getCode(),info.getMessage(), inputPath);\r
- }\r
- throw new JToscaException(String.format("CSAR Validation Failed. CSAR name - {}. Please check logs for details.", inputPath), JToscaErrorCodes.CSAR_TOSCA_VALIDATION_ERROR.getValue());\r
- }\r
- }\r
- public List<JToscaValidationIssue> getCriticalExceptions() {\r
- return criticalExceptions;\r
- }\r
-\r
- public List<JToscaValidationIssue> getWarningExceptions() {\r
- return warningExceptions;\r
- }\r
-\r
- public List<JToscaValidationIssue> getNotAnalyzadExceptions() {\r
- return notAnalyzadExceptions;\r
- }\r
-\r
-\r
- private void validateCsarVersion(String cSarVersion) throws SdcToscaParserException {\r
- ConformanceLevel level = configurationManager.getConfiguration().getConformanceLevel();\r
- String minVersion = level.getMinVersion();\r
- String maxVersion = level.getMaxVersion();\r
- if (cSarVersion != null) {\r
- if ((GeneralUtility.conformanceLevelCompare(cSarVersion, minVersion) < 0) || (GeneralUtility.conformanceLevelCompare(cSarVersion, maxVersion) > 0)) {\r
- throwConformanceLevelException(minVersion, maxVersion);\r
- }\r
- } else {\r
- throwConformanceLevelException(minVersion, maxVersion);\r
- }\r
- }\r
-\r
- private boolean isMatchConformanceLevel(String ValidationIssueVersion, String cSarVersion){\r
- if (ValidationIssueVersion != null && cSarVersion != null) {\r
- if ((GeneralUtility.conformanceLevelCompare(ValidationIssueVersion, cSarVersion) >= 0)) {\r
- return true;\r
- }\r
- }\r
- return false;\r
- }\r
- private void throwConformanceLevelException(String minVersion, String maxVersion) throws SdcToscaParserException {\r
- ErrorInfo errorInfo = configurationManager.getErrorConfiguration().getErrorInfo(SdcToscaParserErrors.CONFORMANCE_LEVEL_ERROR.toString());\r
- throw new SdcToscaParserException(String.format(errorInfo.getMessage(), minVersion, maxVersion), errorInfo.getCode());\r
- }\r
-\r
- private void throwSdcToscaParserException(JToscaException e) throws SdcToscaParserException {\r
- ErrorInfo errorInfo = configurationManager.getErrorConfiguration().getErrorInfo(SdcToscaParserErrors.getSdcErrorByJToscaError(JToscaErrorCodes.getByCode(e.getCode())).toString());\r
- throw new SdcToscaParserException(errorInfo.getMessage(), errorInfo.getCode());\r
- }\r
-\r
-\r
-\r
+package org.onap.sdc.tosca.parser.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.sdc.tosca.parser.api.ConformanceLevel;
+import org.onap.sdc.tosca.parser.config.ConfigurationManager;
+import org.onap.sdc.tosca.parser.config.ErrorInfo;
+import org.onap.sdc.tosca.parser.config.JToscaValidationIssueInfo;
+import org.onap.sdc.tosca.parser.config.SdcToscaParserErrors;
+import org.onap.sdc.tosca.parser.utils.GeneralUtility;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.config.*;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.ToscaTemplate;
+import org.onap.sdc.toscaparser.api.common.JToscaValidationIssue;
+import org.onap.sdc.toscaparser.api.common.JToscaException;
+import org.onap.sdc.toscaparser.api.utils.JToscaErrorCodes;
+import org.onap.sdc.toscaparser.api.utils.ThreadLocalsHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SdcToscaParserFactory {
+ private static Logger log = LoggerFactory.getLogger(SdcToscaParserFactory.class.getName());
+
+ private static ConfigurationManager configurationManager;
+ private static volatile SdcToscaParserFactory instance;
+ private List<JToscaValidationIssue> criticalExceptions = new ArrayList<>();
+ private List<JToscaValidationIssue> warningExceptions = new ArrayList<>();
+ private List<JToscaValidationIssue> notAnalyzadExceptions = new ArrayList<>();
+ private SdcToscaParserFactory() {}
+
+ /**
+ * Get an SdcToscaParserFactory instance.
+ * @return SdcToscaParserFactory instance.
+ */
+ public static SdcToscaParserFactory getInstance() {
+ if (instance == null) {
+ synchronized (SdcToscaParserFactory.class) {
+ if (instance == null) {
+ instance = new SdcToscaParserFactory();
+ configurationManager = ConfigurationManager.getInstance();
+ }
+ }
+ }
+ return instance;
+ }
+
+ public static void setConfigurationManager(ConfigurationManager configurationManager) {
+ SdcToscaParserFactory.configurationManager = configurationManager;
+ }
+
+ /**
+ * Get an ISdcCsarHelper object for this CSAR file.
+ *
+ * @param csarPath - the absolute path to CSAR file.
+ * @return ISdcCsarHelper object.
+ * @throws SdcToscaParserException - in case the path or CSAR are invalid.
+ */
+ public ISdcCsarHelper getSdcCsarHelper(String csarPath) throws SdcToscaParserException {
+ return init(csarPath, true);
+ }
+
+ /**
+ * Get an ISdcCsarHelper object for this CSAR file.
+ *
+ * @param csarPath - the absolute path to CSAR file.
+ * @param resolveGetInput - resolve get_input properties
+ * @return ISdcCsarHelper object.
+ * @throws SdcToscaParserException - in case the path or CSAR are invalid.
+ */
+ public ISdcCsarHelper getSdcCsarHelper(String csarPath, boolean resolveGetInput) throws SdcToscaParserException {
+ return init(csarPath, resolveGetInput);
+ }
+
+ private ISdcCsarHelper init(String csarPath, boolean resolveGetInput) throws SdcToscaParserException {
+ synchronized (SdcToscaParserFactory.class) {
+ ToscaTemplate tosca = null;
+ try {
+ tosca = new ToscaTemplate(csarPath, null, true, null, resolveGetInput);
+ } catch (JToscaException e) {
+ throwSdcToscaParserException(e);
+ }
+ SdcCsarHelperImpl sdcCsarHelperImpl = new SdcCsarHelperImpl(tosca, configurationManager);
+ String cSarConformanceLevel = sdcCsarHelperImpl.getConformanceLevel();
+ validateCsarVersion(cSarConformanceLevel);
+ try {
+ handleErrorsByTypes(csarPath, cSarConformanceLevel);
+ } catch (JToscaException e) {
+ throwSdcToscaParserException(e);
+ }
+ return sdcCsarHelperImpl;
+ }
+ }
+
+ private void handleErrorsByTypes(String csarPath, String cSarConformanceLevel) throws JToscaException {
+ clearValidationIssuesLists();
+ for(JToscaValidationIssue toscaValidationIssue : ThreadLocalsHolder.getCollector().getValidationIssues().values()){
+ List<JToscaValidationIssueInfo> issueInfos = configurationManager.getJtoscaValidationIssueConfiguration().getValidationIssues().get(toscaValidationIssue.getCode());
+ if(issueInfos != null && !issueInfos.isEmpty()){
+ JToscaValidationIssueInfo issueInfo = null;
+ issueInfo = issueInfos.stream()
+ .filter(i-> isMatchConformanceLevel(cSarConformanceLevel,i.getSinceCsarConformanceLevel()))
+ .max((i1,i2) -> GeneralUtility.conformanceLevelCompare(i1.getSinceCsarConformanceLevel(), i2.getSinceCsarConformanceLevel()) )
+ .orElse(null);
+
+ if(issueInfo != null){
+ switch (JToscaValidationIssueType.valueOf(issueInfo.getIssueType())) {
+ case CRITICAL:
+ criticalExceptions.add(toscaValidationIssue);
+ break;
+ case WARNING:
+ warningExceptions.add(toscaValidationIssue);
+ break;
+ default:
+ break;
+ }
+ }else{
+ notAnalyzadExceptions.add(toscaValidationIssue);
+ }
+ }else{//notAnalyzed
+ notAnalyzadExceptions.add(toscaValidationIssue);
+ }
+ }
+ logErrors(csarPath);
+ }
+
+ private void clearValidationIssuesLists(){
+ notAnalyzadExceptions.clear();
+ criticalExceptions.clear();
+ warningExceptions.clear();
+ }
+
+ private void logErrors(String inputPath) throws JToscaException{
+ //Warnings
+ int warningsCount = warningExceptions.size();
+ if (warningsCount > 0) {
+ log.warn("####################################################################################################");
+ log.warn("CSAR Warnings found! CSAR name - {}", inputPath);
+ log.warn("ToscaTemplate - verifyTemplate - {} Parsing Warning{} occurred...", warningsCount, (warningsCount > 1 ? "s" : ""));
+ for (JToscaValidationIssue info : warningExceptions) {
+ log.warn("JTosca Exception [{}]: {}. CSAR name - {}", info.getCode(),info.getMessage(), inputPath);
+ }
+ log.warn("####################################################################################################");
+ }
+ //Criticals
+ int criticalsCount = criticalExceptions.size();
+ if (criticalsCount > 0) {
+ log.error("####################################################################################################");
+ log.error("ToscaTemplate - verifyTemplate - {} Parsing Critical{} occurred...", criticalsCount, (criticalsCount > 1 ? "s" : ""));
+ for (JToscaValidationIssue info : criticalExceptions) {
+ log.error("JTosca Exception [{}]: {}. CSAR name - {}", info.getCode(),info.getMessage(), inputPath);
+ }
+ throw new JToscaException(String.format("CSAR Validation Failed. CSAR name - {}. Please check logs for details.", inputPath), JToscaErrorCodes.CSAR_TOSCA_VALIDATION_ERROR.getValue());
+ }
+ }
+ public List<JToscaValidationIssue> getCriticalExceptions() {
+ return criticalExceptions;
+ }
+
+ public List<JToscaValidationIssue> getWarningExceptions() {
+ return warningExceptions;
+ }
+
+ public List<JToscaValidationIssue> getNotAnalyzadExceptions() {
+ return notAnalyzadExceptions;
+ }
+
+
+ private void validateCsarVersion(String cSarVersion) throws SdcToscaParserException {
+ ConformanceLevel level = configurationManager.getConfiguration().getConformanceLevel();
+ String minVersion = level.getMinVersion();
+ String maxVersion = level.getMaxVersion();
+ if (cSarVersion != null) {
+ if ((GeneralUtility.conformanceLevelCompare(cSarVersion, minVersion) < 0) || (GeneralUtility.conformanceLevelCompare(cSarVersion, maxVersion) > 0)) {
+ throwConformanceLevelException(minVersion, maxVersion);
+ }
+ } else {
+ throwConformanceLevelException(minVersion, maxVersion);
+ }
+ }
+
+ private boolean isMatchConformanceLevel(String ValidationIssueVersion, String cSarVersion){
+ if (ValidationIssueVersion != null && cSarVersion != null) {
+ if ((GeneralUtility.conformanceLevelCompare(ValidationIssueVersion, cSarVersion) >= 0)) {
+ return true;
+ }
+ }
+ return false;
+ }
+ private void throwConformanceLevelException(String minVersion, String maxVersion) throws SdcToscaParserException {
+ ErrorInfo errorInfo = configurationManager.getErrorConfiguration().getErrorInfo(SdcToscaParserErrors.CONFORMANCE_LEVEL_ERROR.toString());
+ throw new SdcToscaParserException(String.format(errorInfo.getMessage(), minVersion, maxVersion), errorInfo.getCode());
+ }
+
+ private void throwSdcToscaParserException(JToscaException e) throws SdcToscaParserException {
+ ErrorInfo errorInfo = configurationManager.getErrorConfiguration().getErrorInfo(SdcToscaParserErrors.getSdcErrorByJToscaError(JToscaErrorCodes.getByCode(e.getCode())).toString());
+ throw new SdcToscaParserException(errorInfo.getMessage(), errorInfo.getCode());
+ }
+
+
+
}
\ No newline at end of file
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.tosca.parser.impl;
+package org.onap.sdc.tosca.parser.impl;
import java.util.Arrays;
import java.util.List;
-package org.openecomp.sdc.tosca.parser.utils;
+package org.onap.sdc.tosca.parser.utils;
import java.util.Arrays;
-package org.openecomp.sdc.tosca.parser.utils;\r
-\r
-import java.util.regex.Pattern;\r
-\r
-public class SdcToscaUtility {\r
- \r
- public final static Pattern COMPONENT_INSTANCE_NAME_DELIMETER_PATTERN = Pattern.compile("[\\.\\-]+");\r
- \r
- public static String normaliseComponentInstanceName(String name) {\r
- String normalizedName = name.toLowerCase();\r
- normalizedName = COMPONENT_INSTANCE_NAME_DELIMETER_PATTERN.matcher(normalizedName).replaceAll(" ");\r
- String[] split = normalizedName.split(" ");\r
- StringBuffer sb = new StringBuffer();\r
- for (String splitElement : split) {\r
- sb.append(splitElement);\r
- }\r
- return sb.toString();\r
- }\r
-}\r
+package org.onap.sdc.tosca.parser.utils;
+
+import java.util.regex.Pattern;
+
+public class SdcToscaUtility {
+
+ public final static Pattern COMPONENT_INSTANCE_NAME_DELIMETER_PATTERN = Pattern.compile("[\\.\\-]+");
+
+ public static String normaliseComponentInstanceName(String name) {
+ String normalizedName = name.toLowerCase();
+ normalizedName = COMPONENT_INSTANCE_NAME_DELIMETER_PATTERN.matcher(normalizedName).replaceAll(" ");
+ String[] split = normalizedName.split(" ");
+ StringBuffer sb = new StringBuffer();
+ for (String splitElement : split) {
+ sb.append(splitElement);
+ }
+ return sb.toString();
+ }
+}
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.tosca.parser.utils;
+package org.onap.sdc.tosca.parser.utils;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.openecomp.sdc.toscaparser.api.common.JToscaException;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.common.JToscaException;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeSuite;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.tosca.parser.config.ErrorConfiguration;
-import org.openecomp.sdc.tosca.parser.config.JtoscaValidationIssueConfiguration;
+import org.onap.sdc.tosca.parser.config.ErrorConfiguration;
+import org.onap.sdc.tosca.parser.config.JtoscaValidationIssueConfiguration;
import org.testng.annotations.Test;
-import org.openecomp.sdc.tosca.parser.config.Configuration;
-import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
+import org.onap.sdc.tosca.parser.config.Configuration;
+import org.onap.sdc.tosca.parser.config.ConfigurationManager;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
import java.io.File;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.utils.JToscaErrorCodes;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.utils.JToscaErrorCodes;
/*put(JToscaErrorCodes.GENERAL_ERROR, GENERAL_ERROR);
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import org.testng.annotations.Test;
-import org.openecomp.sdc.tosca.parser.utils.GeneralUtility;
+import org.onap.sdc.tosca.parser.utils.GeneralUtility;
import static org.testng.Assert.assertTrue;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import org.testng.annotations.Test;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
-import java.util.Arrays;
import java.util.List;
import static org.testng.Assert.*;
-package org.openecomp.sdc.impl;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+package org.onap.sdc.impl;
+
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.config.ConfigurationManager;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
import org.testng.annotations.Test;
import java.util.List;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.FilterType;
-import org.openecomp.sdc.tosca.parser.impl.SdcTypes;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.Property;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.FilterType;
+import org.onap.sdc.tosca.parser.impl.SdcTypes;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.Property;
import org.testng.annotations.Test;
import fj.data.fingertrees.Node;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.tosca.parser.impl.SdcTypes;
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignments;
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignment;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.RequirementAssignments;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.impl.SdcTypes;
+import org.onap.sdc.toscaparser.api.CapabilityAssignments;
+import org.onap.sdc.toscaparser.api.CapabilityAssignment;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.RequirementAssignments;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
import org.testng.annotations.Test;
import java.util.List;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import org.testng.annotations.Test;
-import org.openecomp.sdc.toscaparser.api.parameters.Input;
+import org.onap.sdc.toscaparser.api.parameters.Input;
import java.util.List;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import java.util.*;
-import java.util.stream.Collectors;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignment;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.RequirementAssignment;
-import org.openecomp.sdc.toscaparser.api.elements.CapabilityTypeDef;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.CapabilityAssignment;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.RequirementAssignment;
+import org.onap.sdc.toscaparser.api.elements.CapabilityTypeDef;
//import org.testng.ReporterConfig.Property;
import org.testng.annotations.Test;
-import org.openecomp.sdc.toscaparser.api.Property;
+import org.onap.sdc.toscaparser.api.Property;
//import static org.junit.Assert.assertEquals;
//import static org.junit.Assert.assertNull;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.apache.commons.io.IOUtils;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
-import org.openecomp.sdc.tosca.parser.config.JtoscaValidationIssueConfiguration;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.common.JToscaValidationIssue;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.config.ConfigurationManager;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.common.JToscaValidationIssue;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.io.IOException;
-import java.net.URL;
import java.util.List;
import java.util.stream.Collectors;
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
import org.testng.annotations.Test;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
import java.io.File;
-import java.util.List;
-import static org.openecomp.sdc.impl.SdcToscaParserBasicTest.getCsarHelper;
+import static org.onap.sdc.impl.SdcToscaParserBasicTest.getCsarHelper;
public class myTest {
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=2
-patch=3
+minor=3
+patch=0
base_version=${major}.${minor}.${patch}
Code Review / sdc / sdc-tosca.git / commitdiff