Basic PNFD validation

Change-Id: I959324f3fc0ba89d99a291d0608aa5a5ba778077
Issue-ID: VNFSDK-341
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java b/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java
index d348235..730b27d 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java
@@ -24,6 +24,8 @@ import java.util.Properties;
 import org.onap.cli.fw.cmd.OnapCommand;
 import org.onap.cli.fw.error.OnapCommandException;
 import org.onap.cli.fw.error.OnapCommandExecutionFailed;
+import org.onap.cli.fw.error.OnapCommandInvalidParameterValue;
+import org.onap.cli.fw.input.OnapCommandParameter;
 import org.onap.cli.fw.output.OnapCommandResultType;
 import org.onap.cli.fw.registrar.OnapCommandRegistrar;
 import org.onap.cli.fw.schema.OnapCommandSchema;
@@ -39,6 +41,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @OnapCommandSchema(schema = "vtp-validate-csar.yaml")
 public class VTPValidateCSAR extends OnapCommand {
     private static final Logger LOG = LoggerFactory.getLogger(VTPValidateCSAR.class);
+    public static final String PNF_ATTRIBUTE_NAME = "pnf";
 
     public static class CSARValidation {
         public static class VNF {
@@ -184,7 +187,7 @@ public class VTPValidateCSAR extends OnapCommand {
     protected void run() throws OnapCommandException {
         //Read the input arguments
         String path = (String) getParametersMap().get("csar").getValue();
-        boolean isPnf = (boolean) getParametersMap().get("pnf").getValue();
+        boolean isPnf = (boolean) getParametersMap().get(PNF_ATTRIBUTE_NAME).getValue();
 
         boolean overallPass = true;
         try(CSARArchive csar = isPnf ? new PnfCSARArchive(): new CSARArchive()){
@@ -228,6 +231,7 @@ public class VTPValidateCSAR extends OnapCommand {
                     String command = "csar-validate-" + vnfreq;
                     OnapCommand cmd = OnapCommandRegistrar.getRegistrar().get(command, this.getInfo().getProduct());
                     cmd.getParametersMap().get("csar").setValue(path);
+                    setPnfValueIfAvailable(isPnf, cmd);
 
                     result.setDescription(cmd.getDescription());
                     cmd.execute();
@@ -266,6 +270,13 @@ public class VTPValidateCSAR extends OnapCommand {
         }
     }
 
+    private void setPnfValueIfAvailable(boolean isPnf, OnapCommand cmd) throws OnapCommandInvalidParameterValue {
+        final OnapCommandParameter pnf = cmd.getParametersMap().get(PNF_ATTRIBUTE_NAME);
+        if(pnf!=null) {
+            pnf.setValue(isPnf);
+        }
+    }
+
     private List<String> getPropertiesList(String key) {
         String[] enabledReqs = prp.getProperty(key, "").split(",");
         List<String> list = new ArrayList<>();