X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Ftools%2Fgenerate_descriptor_pkg.sh;h=1b9a9e03fd9c9f6adea38c73074b56d78d680861;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=bff87854faece3025994f43c53f008fba15746d4;hpb=a1b5bdbd86de48f3bfbf590e6148a311851cde39;p=osm%2Fdevops.git

diff --git a/descriptor-packages/tools/generate_descriptor_pkg.sh b/descriptor-packages/tools/generate_descriptor_pkg.sh
index bff87854..1b9a9e03 100755
--- a/descriptor-packages/tools/generate_descriptor_pkg.sh
+++ b/descriptor-packages/tools/generate_descriptor_pkg.sh
@@ -47,6 +47,7 @@ NSD_FOLDERS=(scripts charms icons ns_config vnf_config)
 
 # Other files allowed in the descriptor base directory
 ALLOWED_FILES=(README)
+ALLOWED_FILES_WILDCARDS=(README)
 
 DESC_TYPES=(vnfd nsd)
 DESC_EXTN=(yml yaml json xml)
@@ -756,7 +757,11 @@ if [ $CREATE == false ]; then
 
     for f in ${files[@]}; do
         if [ $(contains "${ALLOWED_FILES[@]}" $f)  == "n" ]; then
-            echo "WARN: Unsupported file $f found"
+            for j in ${ALLOWED_FILES_WILDCARDS[@]}; do
+                if [[ $f != *"$j"* ]]; then
+                    echo "WARN: Unsupported file $f found"
+                fi
+            done
         fi
     done
 
@@ -791,7 +796,8 @@ if [ $CREATE == false ]; then
 
     cd $BASE_DIR
     # Mrityunjay Yadav: Validate descriptor
-    python /usr/share/osm-devops/descriptor-packages/tools/validate_descriptor.py $DEST_DIR/$PKG/$descriptor
+    GEN_BASEDIR=$(dirname "$0")
+    python3 $GEN_BASEDIR/validate_descriptor.py $BASE_DIR/$PKG/$descriptor
     if [ $? -ne 0 ]; then
         rc=$?
         echo "ERROR: validating descriptor for $PKG ($rc)" >&2