From 0d4544eb82a2ca79d7724e5c1da70d3943db76eb Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Fri, 15 Mar 2019 10:43:42 +0100 Subject: Update manifest parser Change-Id: I420fd9fb97450cbcc2afc15632717182e18f0333 Issue-ID: VNFSDK-384 Signed-off-by: Zebek Bogumil --- .../java/org/onap/cvc/csar/PnfCSARArchiveTest.java | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java') diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java index 4a211a5..d7370e4 100644 --- a/csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java +++ b/csarvalidation/src/test/java/org/onap/cvc/csar/PnfCSARArchiveTest.java @@ -50,18 +50,23 @@ public class PnfCSARArchiveTest { private void verifyThatNonManoArtifactsWereSet(PnfCSARArchive pnfCSARArchive) { Map>> nonManoArtifacts = pnfCSARArchive.getManifest().getNonMano(); - assertThat(nonManoArtifacts.get("prv.onap.ves_event").get("Source")) - .isEqualTo(Lists.newArrayList("Artifacts/Deployment/Events/RadioNode_Pnf_v1.yml") + assertThat(nonManoArtifacts.get("onap_ves_events").get("source")) + .isEqualTo(Lists.newArrayList("Artifacts/Events/VES_registration.yml") ); - assertThat(nonManoArtifacts.get("prv.onap.pm_dictionary").get("Source")) - .isEqualTo(Lists.newArrayList("Artifacts/Deployment/Measurements/PM_Dictionary.yml") + assertThat(nonManoArtifacts.get("onap_pm_dictionary").get("source")) + .isEqualTo(Lists.newArrayList("Artifacts/Measurements/PM_Dictionary.yaml") ); - assertThat(nonManoArtifacts.get("prv.onap.yang_modules").get("Source")) + assertThat(nonManoArtifacts.get("onap_yang_module").get("source")) + .isEqualTo(Lists.newArrayList("Artifacts/Yang_module/Yang_module.yaml") + ); + assertThat(nonManoArtifacts.get("onap_others").get("source")) .isEqualTo(Lists.newArrayList( - "Artifacts/Deployment/Yang_module/yang-module1.yang", - "Artifacts/Deployment/Yang_module/yang-module2.yang" - ) - ); + "Artifacts/scripts/install.sh", + "Artifacts/Informational/user_guide.txt", + "Artifacts/Other/installation_guide.txt", + "Artifacts/Other/review_log.txt" + ) + ); } private void verifyThatMetadataWasSet(PnfCSARArchive pnfCSARArchive) { -- cgit 1.2.3-korg