X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=config%2Futils%2Fcheck-schema.sh;h=041c030833972d5b4a0acb6de6b72474cc7ebc05;hb=HEAD;hp=61bdec2266f04cb4c9dc7bf66d61ffb34256e0ec;hpb=9f61971b20d02c8d0fdbd8a7034f957a7fb9177a;p=pharos.git

diff --git a/config/utils/check-schema.sh b/config/utils/check-schema.sh
index 61bdec22..041c0308 100755
--- a/config/utils/check-schema.sh
+++ b/config/utils/check-schema.sh
@@ -9,25 +9,39 @@
 
 export PATH=$PATH:/usr/local/bin/
 
-VALIDATE_SCHEMA='./config/utils/validate_schema.py'
+VALIDATE_SCHEMA='python ./config/utils/validate_schema.py'
 PDF_SCHEMA='./config/pdf/pod1.schema.yaml'
+IDF_SCHEMA='./config/pdf/idf-pod1.schema.yaml'
 RC=0
 
+SUMMARY+=";;PDF;IDF;\n"
 while IFS= read -r lab_config; do
+    idf_config="$(dirname "${lab_config}")/idf-$(basename "${lab_config}")"
     pdf_cmd="${VALIDATE_SCHEMA} -s ${PDF_SCHEMA} -y ${lab_config}"
+    idf_cmd="${VALIDATE_SCHEMA} -s ${IDF_SCHEMA} -y ${idf_config}"
     echo "###################### ${lab_config} ######################"
-    pdf_out=$(${pdf_cmd} |& sed 's|ENC\[PKCS.*\][\\n]*|opnfv|g')
+    pdf_out=$(${pdf_cmd} 2>&1 | sed 's|ENC\[PKCS.*\][\\n]*|opnfv|g')
     if [ -z "${pdf_out}" ]; then
-        SUMMARY+=";${lab_config#labs/};OK;\n"
+        SUMMARY+=";${lab_config#labs/};OK;"
         echo "[PDF] [OK] ${pdf_cmd}"
     else
-        SUMMARY+=";${lab_config#labs/};ERROR;\n"
+        SUMMARY+=";${lab_config#labs/};ERROR;"
         RC=1
         echo "${pdf_out}"
         echo "[PDF] [ERROR] ${pdf_cmd}"
     fi
+    if [ ! -f "${idf_config}" ]; then
+        SUMMARY+="-;\n"
+    elif ${idf_cmd}; then
+        SUMMARY+="OK;\n"
+        echo "[IDF] [OK] ${idf_cmd}"
+    else
+        SUMMARY+="ERROR;\n"
+        RC=1
+        echo "[IDF] [ERROR] ${idf_cmd}"
+    fi
     echo ''
-done < <(find 'labs' -name 'pod*.yaml')
+done < <(find 'labs' -name 'pod*.yaml' -or -name 'virtual*.yaml')
 
 cat <<EOF
 ###################### Schema Validation Matrix ######################