1 files changed, 30 insertions, 24 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 835bc11..95ad56f 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java
@@ -221,30 +221,7 @@ public class VTPValidateCSAR extends OnapCommand {
                 CSARValidation.Result result = new CSARValidation.Result();
                 result.setVnfreqName(vnfreq);
 
-                try {
-                    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();
-
-                    for (CSARError error: (List<CSARError>) cmd.getResult().getOutput()) {
-                        if (!ignoreCodes.contains(error.getCode()) && !ignoreCodes.contains(vnfreq + "-"+ error.getCode())) {
-                            result.getErrors().add(error);
-                            overallPass = false;
-                        }
-                    }
-
-                    result.setPassed(result.getErrors().isEmpty());
-                    validation.getResults().add(result);
-                } catch (Exception e) {
-                    result.setPassed(false);
-                    overallPass = false;
-                    result.getErrors().add(new CSARArchive.CSARErrorUnknown(e.getMessage()));
-                    validation.getResults().add(result);
-                }
+                overallPass = validateVnfOrPnf(path, validation, ignoreCodes, vnfreq, result, isPnf, overallPass);
             }
 
             validation.setDate(new Date().toString());
@@ -257,6 +234,35 @@ public class VTPValidateCSAR extends OnapCommand {
         }
     }
 
+    private boolean validateVnfOrPnf(String path, CSARValidation validation,
+        List < String > ignoreCodes, String vnfreq, CSARValidation.Result result, boolean isPnf, boolean overallPass) {
+        try {
+            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();
+
+            for (CSARError error: (List < CSARError > ) cmd.getResult().getOutput()) {
+                if (!ignoreCodes.contains(error.getCode()) && !ignoreCodes.contains(vnfreq + "-" + error.getCode())) {
+                    result.getErrors().add(error);
+                    overallPass = false;
+                }
+            }
+
+            result.setPassed(result.getErrors().isEmpty());
+            validation.getResults().add(result);
+        } catch (Exception e) {
+            result.setPassed(false);
+            overallPass = false;
+            result.getErrors().add(new CSARArchive.CSARErrorUnknown(e.getMessage()));
+            validation.getResults().add(result);
+        }
+        return overallPass;
+    }
+
     static CSARValidation createCsarValidationFor(CSARArchive csar) {
         //Fill up the basic details
         CSARValidation validation = new CSARValidation();