Fix regex for coverage projects function

The regular expresion that determines which repository is covered
by the Unit test was wrong. This change modifies this regex to remove
exact matches.

Change-Id: Iffbd241c9463e57953b607d1f389d3be073d6b25
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-Id: INT-289

7 files changed, 41 insertions, 46 deletions

diff --git a/bootstrap/vagrant-onap/lib/aai b/bootstrap/vagrant-onap/lib/aai
index 4da5763ca..d267e020d 100755
--- a/bootstrap/vagrant-onap/lib/aai
+++ b/bootstrap/vagrant-onap/lib/aai
@@ -6,10 +6,11 @@ source /var/onap/functions
 
 hbase_version=1.2.3
 aai_src_folder=$git_src_folder/aai
-aai_repos=("aai-common" "aai-config" "aai-data" "aai-service" "babel" "champ" \
-"data-router" "esr-gui" "esr-server" "gizmo" "logging-service" "model-loader" \
-"resources" "rest-client" "router-core" "search-data-service" "test-config" \
-"traversal" "sparky-fe" "sparky-be")
+aai_repos=("aai/aai-common" "aai/aai-config" "aai/aai-data" "aai/aai-service" \
+"aai/babel" "aai/champ" "aai/data-router" "aai/esr-gui" "aai/esr-server" \
+"aai/gizmo" "aai/logging-service" "aai/model-loader" "aai/resources" \
+"aai/rest-client" "aai/router-core" "aai/search-data-service" \
+"aai/test-config" "aai/traversal" "aai/sparky-fe" "aai/sparky-be")
 
 # install_hadoop() - Function that installs Hadoop
 function install_hadoop {
@@ -54,20 +55,20 @@ function install_haproxy {
 
 # clone_all_aai_repos() - Function that clones AAI source repo.
 function clone_all_aai_repos {
-    for dirc in ${aai_repos[@]}; do
-        clone_repo aai/$dirc $aai_src_folder/$dirc
+    for repo in ${aai_repos[@]}; do
+        clone_repo $repo $aai_src_folder${repo#*aai}
     done
 }
 
 # compile_aai_repos() - Function that compiles AAI source repo.
 function compile_aai_repos {
-    local repos=("aai-common" "resources" "logging-service" "traversal")
+    local repos=("aai/aai-common" "aai/resources" "aai/logging-service" "aai/traversal")
     if [[ "$compile_repo" == "True" ]]; then
         repos=("${aai_repos[@]}")
     fi
 
-    for dirc in ${repos[@]}; do
-        compile_src $aai_src_folder/$dirc
+    for repo in ${repos[@]}; do
+        compile_src $aai_src_folder${repo#*aai}
     done
 }
 
diff --git a/bootstrap/vagrant-onap/lib/policy b/bootstrap/vagrant-onap/lib/policy
index f43087b1d..be4cb2c18 100755
--- a/bootstrap/vagrant-onap/lib/policy
+++ b/bootstrap/vagrant-onap/lib/policy
@@ -5,19 +5,21 @@ set -o xtrace
 source /var/onap/functions
 
 policy_src_folder=$git_src_folder/policy
-policy_repos=("api" "common" "docker" "drools-applications" "drools-pdp" "engine" "gui" "pap" "pdp")
+policy_repos=("policy/api" "policy/common" "policy/docker" \
+"policy/drools-applications" "policy/drools-pdp" "policy/engine" \
+"policy/gui" "policy/pap" "policy/pdp")
 
 # clone_all_policy_repos() - Function that clones Policy source repo.
 function clone_all_policy_repos {
-    for dirc in ${policy_repos[@]}; do
-        clone_repo policy/$dirc $policy_src_folder/$dirc
+    for repo in ${policy_repos[@]}; do
+        clone_repo $repo $policy_src_folder${repo#*policy}
     done
 }
 
 # compile_all_policy_repos() - Function that compiles Policy source repo.
 function compile_all_policy_repos {
-    for dirc in ${policy_repos[@]}; do
-        compile_src $policy_src_folder/$dirc
+    for repo in ${policy_repos[@]}; do
+        compile_src $policy_src_folder${repo#*policy}
     done
 }
 
diff --git a/bootstrap/vagrant-onap/lib/sdnc b/bootstrap/vagrant-onap/lib/sdnc
index f93a6682d..5faca942e 100755
--- a/bootstrap/vagrant-onap/lib/sdnc
+++ b/bootstrap/vagrant-onap/lib/sdnc
@@ -6,22 +6,23 @@ source /var/onap/functions
 source /var/onap/ccsdk
 
 sdnc_src_folder=$git_src_folder/openecomp/sdnc
-sdnc_repos=("adaptors" "architecture" "core" "features" "northbound" "oam" "parent" "plugins")
+sdnc_repos=("sdnc/adaptors" "sdnc/architecture" "sdnc/core" "sdnc/features" \
+"sdnc/northbound" "sdnc/oam" "sdnc/parent" "sdnc/plugins")
 
 # clone_all_sdnc_repos() - Function that clones SDNC source repo.
 function clone_all_sdnc_repos {
-    for dirc in ${sdnc_repos[@]}; do
-        clone_repo sdnc/$dirc $sdnc_src_folder/$dirc
+    for repo in ${sdnc_repos[@]}; do
+        clone_repo $repo $sdnc_src_folder${repo#*sdnc}
     done
 }
 
 # compile_all_sdnc_repos() - Function that compiles SDNC source repo.
 function compile_all_sdnc_repos {
-    for dirc in ${sdnc_repos[@]}; do
-        if [[ "$dirc" == "core" ]]; then
+    for repo in ${sdnc_repos[@]}; do
+        if [[ "$repo" == "sdnc/core" ]]; then
             compile_src $sdnc_src_folder/core/rootpom
         fi
-        compile_src $sdnc_src_folder/$dirc
+        compile_src $sdnc_src_folder${repo#*sdnc}
     done
 }
 
diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc
index 5cf0ed13b..fc26af282 100755
--- a/bootstrap/vagrant-onap/lib/vfc
+++ b/bootstrap/vagrant-onap/lib/vfc
@@ -5,17 +5,16 @@ set -o xtrace
 source /var/onap/functions
 
 vfc_src_folder=$git_src_folder/vfc
-vfc_repos=("gvnfm" "gvnfm/vnflcm" "gvnfm/vnfmgr" "gvnfm/vnfres" "nfvo" \
-"nfvo/catalog" "nfvo/driver" "nfvo/driver/ems" "nfvo/driver/sfc" \
-"nfvo/driver/vnfm" "nfvo/driver/vnfm/gvnfm" "nfvo/driver/vnfm/svnfm" \
-"nfvo/lcm" "nfvo/resmanagement" "nfvo/wfengine")
+vfc_repos=("vfc/gvnfm" "vfc/gvnfm/vnflcm" "vfc/gvnfm/vnfmgr"  \
+"vfc/gvnfm/vnfres" "vfc/nfvo" "vfc/nfvo/catalog" "vfc/nfvo/driver" \
+"vfc/nfvo/driver/ems" "vfc/nfvo/driver/sfc" "vfc/nfvo/driver/vnfm" \
+"vfc/nfvo/driver/vnfm/gvnfm" "vfc/nfvo/driver/vnfm/svnfm" "vfc/nfvo/lcm" \
+"vfc/nfvo/resmanagement" "vfc/nfvo/wfengine")
 
 # clone_all_vfc_repos() - Function that clones VF-C source repo.
 function clone_all_vfc_repos {
-    clone_repo vfc $vfc_src_folder
-
-    for dirc in ${vfc_repos[@]}; do
-        clone_repo vfc/$dirc $vfc_src_folder/$dirc
+    for repo in ${vfc_repos[@]}; do
+        clone_repo $repo $vfc_src_folder${repo#*vfc}
     done
 }
 
diff --git a/bootstrap/vagrant-onap/tests/test_functions b/bootstrap/vagrant-onap/tests/test_functions
index 8043ebbd7..3ab5828cb 100644
--- a/bootstrap/vagrant-onap/tests/test_functions
+++ b/bootstrap/vagrant-onap/tests/test_functions
@@ -178,7 +178,7 @@ function test_coverity_repos {
     pushd /var/onap_tests/
     cp projects.txt remaining_projects.txt
     for covered_repo in "${repos_list[@]}"; do
-        sed -i "/$covered_repo/d" remaining_projects.txt
+        sed -i '/^'${covered_repo//\//\\/}'$/d' remaining_projects.txt
     done
 
     threshold=75
diff --git a/bootstrap/vagrant-onap/tests/test_policy b/bootstrap/vagrant-onap/tests/test_policy
index 0c544cd7d..08231fc7a 100644
--- a/bootstrap/vagrant-onap/tests/test_policy
+++ b/bootstrap/vagrant-onap/tests/test_policy
@@ -49,8 +49,7 @@ function test_compile_all_policy_repos {
     done
     asserts_file_exist $policy_src_folder/drools-applications/controlloop/packages/basex/target/basex-1.1.0-SNAPSHOT.tar.gz
     asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/target/archetype-cl-legacy-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo.v1.0.0/template.demo/target/demo-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-1.1.0-SNAPSHOT.jar
     for feature in eelf healthcheck session-persistence; do
         asserts_file_exist $policy_src_folder/drools-pdp/feature-$feature/target/feature-$feature-1.1.0-SNAPSHOT.jar
     done
diff --git a/bootstrap/vagrant-onap/tests/test_sdnc b/bootstrap/vagrant-onap/tests/test_sdnc
index ddc1d9c6b..7b54749dd 100644
--- a/bootstrap/vagrant-onap/tests/test_sdnc
+++ b/bootstrap/vagrant-onap/tests/test_sdnc
@@ -12,12 +12,12 @@ function test_clone_all_sdnc_repos {
     clone_all_sdnc_repos
 
     asserts_file_exist $sdnc_src_folder/adaptors/pom.xml
-    # asserts_file_exist $sdnc_src_folder/architecture/pom.xml
+    asserts_file_exist $sdnc_src_folder/architecture/docs/index.rst
     asserts_file_exist $sdnc_src_folder/core/pom.xml
-    # asserts_file_exist $sdnc_src_folder/features/pom.xml
+    asserts_file_exist $sdnc_src_folder/features/docs/index.rst
     asserts_file_exist $sdnc_src_folder/northbound/pom.xml
     asserts_file_exist $sdnc_src_folder/oam/pom.xml
-    # asserts_file_exist $sdnc_src_folder/parent/pom.xml
+    asserts_file_exist $sdnc_src_folder/parent/docs/index.rst
     asserts_file_exist $sdnc_src_folder/plugins/pom.xml
 }
 
@@ -27,19 +27,12 @@ function test_compile_all_sdnc_repos {
     compile_all_sdnc_repos
 
     for component in generic-resource-api vnfapi vnftools; do
-        if [[ "$component" != "generic-resource-api" ]]; then
-            if [[ "$component" == "vnfapi" ]]; then
-                asserts_file_exist $sdnc_src_folder/northbound/vnfapi/model/target/vnfapi-model-1.2.0-SNAPSHOT.jar
-            fi
-            asserts_file_exist $sdnc_src_folder/northbound/$component/installer/target/sdnc-$component-1.2.0-SNAPSHOT-installer.zip
-            asserts_file_exist $sdnc_src_folder/northbound/$component/features/target/$component-features-1.2.0-SNAPSHOT.jar
-            asserts_file_exist $sdnc_src_folder/northbound/$component/provider/target/$component-provider-1.2.0-SNAPSHOT.jar
-        else
-            asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/features/target/generic-resource-api.features-1.2.0-SNAPSHOT.jar
-            asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/installer/target/sdnc-generic-resources-api-1.2.0-SNAPSHOT-installer.zip
-            asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/model/target/generic-resource-api.model-1.2.0-SNAPSHOT.jar
-            asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/provider/target/generic-resource-api.provider-1.2.0-SNAPSHOT.jar
+        if [[ "$component" == "vnfapi" ]]; then
+            asserts_file_exist $sdnc_src_folder/northbound/vnfapi/model/target/vnfapi-model-1.2.0-SNAPSHOT.jar
         fi
+        asserts_file_exist $sdnc_src_folder/northbound/$component/installer/target/sdnc-$component-1.2.0-SNAPSHOT-installer.zip
+        asserts_file_exist $sdnc_src_folder/northbound/$component/features/target/$component-features-1.2.0-SNAPSHOT.jar
+        asserts_file_exist $sdnc_src_folder/northbound/$component/provider/target/$component-provider-1.2.0-SNAPSHOT.jar
     done
     asserts_file_exist $sdnc_src_folder/oam/admportal/target/admportal.*-SNAPSHOT.zip
     asserts_file_exist $sdnc_src_folder/oam/dgbuilder/target/dgbuilder.*-SNAPSHOT.zip