diff options
| -rw-r--r-- | csarvalidation/pom.xml | 5 | ||||
| -rw-r--r-- | csarvalidation/src/main/java/org/onap/validation/csar/CommonConstants.java | 6 | ||||
| -rw-r--r-- | csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java | 13 | ||||
| -rw-r--r-- | csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java (renamed from csarvalidation/src/main/java/org/onap/validation/csar/CsarParser.java) | 140 | ||||
| -rw-r--r-- | csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java (renamed from csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarParserTest.java) | 20 |
5 files changed, 134 insertions, 50 deletions
diff --git a/csarvalidation/pom.xml b/csarvalidation/pom.xml index cc38996..6bf50c2 100644 --- a/csarvalidation/pom.xml +++ b/csarvalidation/pom.xml @@ -55,6 +55,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.18</version> + </dependency> + <dependency> <groupId>com.eclipsesource.jaxrs</groupId> <artifactId>consumer</artifactId> <exclusions> diff --git a/csarvalidation/src/main/java/org/onap/validation/csar/CommonConstants.java b/csarvalidation/src/main/java/org/onap/validation/csar/CommonConstants.java index be709ad..03cc36a 100644 --- a/csarvalidation/src/main/java/org/onap/validation/csar/CommonConstants.java +++ b/csarvalidation/src/main/java/org/onap/validation/csar/CommonConstants.java @@ -41,6 +41,10 @@ public class CommonConstants { public static final String TOSCA_META = "TOSCA.meta"; + public static final String MAINSERV_MANIFEST = "MainServiceTemplate.mf"; + + public static final String MAINSERV_TEMPLATE = "MainServiceTemplate.yaml"; + public static final String CSAR_SUFFIX = ".csar"; public static final String HTTP_HEADER_CONTENT_RANGE = "Content-Range"; @@ -61,7 +65,7 @@ public class CommonConstants { public static final int BUFFER_SIZE = 2 * 1024 * 1024; - private CommonConstants() { + private CommonConstants() { // Cannot create instance of the class } diff --git a/csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java b/csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java index 3708dbf..ee0110c 100644 --- a/csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java +++ b/csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java @@ -33,6 +33,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Enumeration; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -135,4 +136,16 @@ public class CsarUtil { } } + public static HashMap<String, String> csarExtract(String filePath) { + + try { + String tempfolder = CsarUtil.getUnzipDir(filePath); + return CsarUtil.unzip(filePath, tempfolder); + + } catch (IOException e1) { + logger.error("CSAR extraction error ! " + e1.getMessage()); + } + return null; + } + } diff --git a/csarvalidation/src/main/java/org/onap/validation/csar/CsarParser.java b/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java index 76a7b11..7d252e1 100644 --- a/csarvalidation/src/main/java/org/onap/validation/csar/CsarParser.java +++ b/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java @@ -20,29 +20,30 @@ import org.slf4j.LoggerFactory; import java.io.*; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; -import java.text.SimpleDateFormat; +import static java.nio.charset.StandardCharsets.*; import java.util.*; +import java.util.stream.Collectors; -import static java.nio.charset.StandardCharsets.*; + +import org.yaml.snakeyaml.Yaml; -public class CsarParser { +public class CsarValidator { - private static final Logger LOG = LoggerFactory.getLogger(CsarParser.class); + private static final Logger LOG = LoggerFactory.getLogger(CsarValidator.class); // Map of CSAR file and un-zipped file indices - private static HashMap<String, String> csarFiles; - - // Map of packageId and CSAR files + static HashMap<String, String> csarFiles; + + // Map of packageId and CSAR files private static HashMap<String, HashMap<String, String>> csar = new HashMap<String, HashMap<String, String>>(); private static final CsarUtil cUtil = new CsarUtil(); - public CsarParser(String csarWithPath) { + public CsarValidator(String packageId, String csarWithPath) { try { FileInputStream is = new FileInputStream(csarWithPath); @@ -50,27 +51,28 @@ public class CsarParser { LOG.error("CSAR %s is not found! ", e2); } try { - boolean ret = csarExtract(csarWithPath); - if(ret == true) { + csarFiles = CsarUtil.csarExtract(csarWithPath); + if(!csarFiles.isEmpty()) { + csar.put(packageId, getCsarFiles()); LOG.debug("CSAR extracted sucessfully."); } } catch (Exception e1) { LOG.error("CSAR %s is not a valid CSAR/ZIP file! ", e1); } + } - /* - * pubic static boolean validateCsar(String filePath) { - * - * csarExtract(filePath); - * - * validateCsarMeta(); - * - * validateToscaMeta(); - * - * validateManifest(); - * } - */ + public static boolean validateCsar() { + + validateCsarMeta(); + + validateToscaMeta(); + + validateMainService(); + + //In future return the status handler object instead. + return true; + } public static boolean validateCsarIntegrity(String csarWithPath) { @@ -91,19 +93,7 @@ public class CsarParser { } } - private static boolean csarExtract(String filePath) { - try { - String tempfolder = CsarUtil.getUnzipDir(filePath); - csarFiles = CsarUtil.unzip(filePath, tempfolder); - - } catch (IOException e1) { - LOG.error("CSAR extraction error ! " + e1.getMessage()); - - return false; - } - return true; - } public static boolean validateCsarMeta() { @@ -142,9 +132,7 @@ public class CsarParser { return true; } } catch (IOException e2) { - LOG.error("Exception cought while validateCsarMeta ! " + e2.getMessage()); - //e2.printStackTrace(); - + LOG.error("Exception caught while validateCsarMeta ! " + e2.getMessage()); } finally { if (reader != null) { try { @@ -168,7 +156,7 @@ public class CsarParser { try { if (!cfile.isEmpty() && cfile.contains( System.getProperty("file.separator")+ CommonConstants.TOSCA_METADATA + System.getProperty("file.separator") + CommonConstants.TOSCA_META)) { - String value = checkEntryFor("Entry-Definitions:", cfile); + String value = checkEntryFor(cfile, "Entry-Definitions:"); if (value == null) { return false; //Check if Entry-Defintions pointed file exists in CSAR @@ -183,8 +171,28 @@ public class CsarParser { return false; } + private static boolean validateMainService() { + String key = "metadata"; + + // Infuture load from the respective file template/schema + List<String> mListMetadata = Arrays.asList("vnf_product_name", "vnf_provider_id", + "vnf_package_version", "vnf_release_data_time"); + boolean mfResult = checkEntryFor(CommonConstants.MAINSERV_MANIFEST, mListMetadata, key); + + List<String> tListMetadata = Arrays.asList("vendor", "csarVersion", + "csarProvider","id", "version", "csarType", "name", "vnfdVersion", + "vnfmType"); + boolean tResult = checkEntryFor(CommonConstants.MAINSERV_TEMPLATE, tListMetadata, key); + + if (tResult && mfResult) { + return true; + } + else { + return false; + } + } - private static String checkEntryFor(String attribute, String fileWithPath) throws IOException { + private static String checkEntryFor(String fileWithPath, String attribute) throws IOException { List<String> lines = Files.readAllLines(Paths.get(fileWithPath), UTF_8); @@ -195,5 +203,57 @@ public class CsarParser { } return null; } + + private static boolean checkEntryFor(String cFile, List<String> attributes, String key) { + String tFileWithPath = csarFiles.get(cFile); + + Yaml yaml = new Yaml(); + Map<String, ?> values = null; + try { + values = (Map<String, ?>) yaml.load(new FileInputStream(new File(tFileWithPath))); + } catch (FileNotFoundException e) { + return false; + } + + Map<String, String> subValues = (Map<String, String>) values.get(key); + + //1. Check for empty values in map and if number of mandatory attributes presence + Map<String, String> mResult = subValues.entrySet() + .stream() + .filter(e -> e.getValue() != null) + .collect(Collectors.toMap(p -> p.getKey(), p -> p.getValue())); + if (mResult.size() != attributes.size()) + { + return false; + } + + //2. Validate the exact mandatory attributes with expected attributes list + List<String> lResult = subValues.values().stream() + .filter(attributes::contains) + .collect(Collectors.toList()); + + // System.out.println(result); + if (lResult.size() != attributes.size()) { + return false; + } + return true; + + } + + public static HashMap<String, HashMap<String, String>> getCsar() { + return csar; + } + + public static void setCsar(HashMap<String, HashMap<String, String>> csar) { + CsarValidator.csar = csar; + } + + public static HashMap<String, String> getCsarFiles() { + return csarFiles; + } + + public static void setCsarFiles(HashMap<String, String> csarFiles) { + CsarValidator.csarFiles = csarFiles; + } } diff --git a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarParserTest.java b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java index ce9ba5b..46d7beb 100644 --- a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarParserTest.java +++ b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java @@ -16,42 +16,44 @@ package org.onap.validation.csarvalidationtest; import org.junit.Test; -import org.onap.validation.csar.CsarParser; +import org.onap.validation.csar.CsarValidator; +import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class CsarParserTest { +public class CsarValidatorTest { String regex = "^\\/[a-zA-Z]\\:\\/"; ClassLoader classLoader = getClass().getClassLoader(); Pattern pattern = Pattern.compile(regex); - private String configFile = classLoader.getResource("enterprise2DC.csar").getFile(); - Matcher matcher = pattern.matcher(configFile); - String dir2 = "/"+configFile.substring(1); + private String csarFile = classLoader.getResource("enterprise2DC.csar").getFile(); + Matcher matcher = pattern.matcher(csarFile); + String dir2 = System.getProperty("file.separator")+csarFile.substring(1); + String packageId = UUID.randomUUID().toString(); - CsarParser csarParser = new CsarParser(dir2); + CsarValidator csarValidator = new CsarValidator(packageId, dir2); @Test public void testValidateCsarMeta() { - boolean result = CsarParser.validateCsarMeta(); + boolean result = CsarValidator.validateCsarMeta(); assertEquals(true, result == true); System.out.println("inside testValidateCsarMeta : " + result); } @Test public void testValidateCsarIntegrity() { - boolean result = csarParser.validateCsarIntegrity(dir2); + boolean result = csarValidator.validateCsarIntegrity(dir2); assertEquals(true, result == true); System.out.println("inside testValidateCsarIntegrity : " + result); } @Test public void testValidateToscaMeta() { - boolean result = csarParser.validateToscaMeta(); + boolean result = csarValidator.validateToscaMeta(); assertEquals(true, result == true); System.out.println("inside testValidateToscaMeta : " + result); } |