Add cli to pmdictionary validation

- Extend pmdictionary validation library by cli

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

diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
index 82ecb3a..b77fe37 100644 (file)
--- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/install-vtp.sh
@@ -77,7 +77,8 @@ cp csarvalidator/commons-lang3*.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/bcpkix-jdk15on-1.61.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/bcprov-jdk15on-1.61.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/commons-collections*.jar $VTP_INSTALL_DIR/lib/
-cp csarvalidator/snakeyaml-1.26.jar $VTP_INSTALL_DIR/lib/
+cp csarvalidator/gson-*.jar $VTP_INSTALL_DIR/lib/
+cp csarvalidator/snakeyaml-*.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/validation-csar*.jar $VTP_INSTALL_DIR/lib/
 cp csarvalidator/validation-pmdictionary*.jar $VTP_INSTALL_DIR/lib/
 rm -rf csarvalidator $CSARVAL_ZIP $VTP_ZIP

diff --git a/vnfmarket-be/deployment/install/vtp_install.sh b/vnfmarket-be/deployment/install/vtp_install.sh
index e862e97..70d529b 100755 (executable)
--- a/vnfmarket-be/deployment/install/vtp_install.sh
+++ b/vnfmarket-be/deployment/install/vtp_install.sh
@@ -163,7 +163,8 @@ function vtp_csar_validation_install() {
         cp $VTP_STAGE_DIR/CSAR-VALIDATE/commons-lang3*.jar $OPEN_CLI_HOME/lib
         cp $VTP_STAGE_DIR/CSAR-VALIDATE/bcpkix-jdk15on-1.61.jar $OPEN_CLI_HOME/lib
         cp $VTP_STAGE_DIR/CSAR-VALIDATE/bcprov-jdk15on-1.61.jar $OPEN_CLI_HOME/lib
-        cp $VTP_STAGE_DIR/CSAR-VALIDATE/snakeyaml-1.26.jar $OPEN_CLI_HOME/lib
+        cp $VTP_STAGE_DIR/CSAR-VALIDATE/gson-*.jar $VTP_INSTALL_DIR/lib/
+        cp $VTP_STAGE_DIR/CSAR-VALIDATE/snakeyaml-*.jar $OPEN_CLI_HOME/lib
         cp $VTP_STAGE_DIR/CSAR-VALIDATE/validation-csar*.jar $OPEN_CLI_HOME/lib
         cp $VTP_STAGE_DIR/CSAR-VALIDATE/validation-pmdictionary*.jar $OPEN_CLI_HOME/lib
     else