diff options
| author |   Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2019-03-21 10:16:55 +0530 |
|---|---|---|
| committer | Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2019-03-22 06:42:23 +0530 |
| commit | 873fbb49dcd3092d2591a4eca13470713ca443ea (patch) | |
| tree | 7bd7b63e4d9938b580a803e69f35ca4994c76c1f /csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004 | |
| parent | 0d4544eb82a2ca79d7724e5c1da70d3943db76eb (diff) | |
Fix the sol004 minor issues
Issue-ID: VNFSDK-352
Change-Id: I13fb8f0bc13d033c93d516e771afcd3440e0949d
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004')
5 files changed, 7 insertions, 5 deletions
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java index 6503c54..1be9814 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java @@ -34,7 +34,7 @@ public class VTPValidateCSARR04298 extends VTPValidateCSARBase { @Override protected void validateCSAR(CSARArchive csar) throws Exception { - if (csar.getTestsFolder() == null) { + if (csar.getTestsFolder() == null || csar.getTestsFolder().listFiles().length == 0) { this.errors.add(new CSARErrorEntryMissingTestFolderNotFound()); } } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR10087.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR10087.java index 31298fa..0e80add 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR10087.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR10087.java @@ -22,6 +22,7 @@ import org.onap.cvc.csar.CSARArchive.CSARError; import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissingToscaDefinitionMetadataTemplateName; import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissingToscaDefinitionNotFound; import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissingToscaMetaDefinition; +import org.onap.cvc.csar.CSARArchive.CSARErrorInvalidEntryValueManifestNotFound; import org.onap.cvc.csar.cc.VTPValidateCSARBase; @OnapCommandSchema(schema = "vtp-validate-csar-r10087.yaml") @@ -33,7 +34,8 @@ public class VTPValidateCSARR10087 extends VTPValidateCSARBase { for (CSARError e : csar.getErrors()) { if (e instanceof CSARErrorEntryMissingToscaMetaDefinition || e instanceof CSARErrorEntryMissingToscaDefinitionNotFound || - e instanceof CSARErrorEntryMissingToscaDefinitionMetadataTemplateName) { + e instanceof CSARErrorEntryMissingToscaDefinitionMetadataTemplateName || + e instanceof CSARErrorInvalidEntryValueManifestNotFound) { this.errors.add(e); } } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java index 17c3018..d33ed3f 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java @@ -26,7 +26,7 @@ public class VTPValidateCSARR13390 extends VTPValidateCSARBase { public static class CSARErrorEntryMissingAnsiblePlaybookNotFound extends CSARErrorEntryMissing { public CSARErrorEntryMissingAnsiblePlaybookNotFound() { - super("cookbooks", CSARArchive.CSAR_Archive); + super("playbooks", CSARArchive.CSAR_Archive); this.setCode("0x1000"); } } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java index e036ce6..f06b84a 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java @@ -33,7 +33,7 @@ public class VTPValidateCSARR26881 extends VTPValidateCSARBase { @Override protected void validateCSAR(CSARArchive csar) throws Exception { - if (!csar.getFileFromCsar("artifacts").exists()) { + if (!csar.getFileFromCsar("Artifacts").exists()) { errors.add(new CSARErrorEntryMissingArtifactsNotFound()); } } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java index efb258b..bf55530 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java @@ -26,7 +26,7 @@ public class VTPValidateCSARR77786 extends VTPValidateCSARBase { public static class CSARErrorEntryMissingAnsiblePlaybookNotFound extends CSARErrorEntryMissing { public CSARErrorEntryMissingAnsiblePlaybookNotFound() { - super("cookbooks", + super("playbooks", CSARArchive.CSAR_Archive); this.setCode("0x1000"); } |