From 2016306c87307d461d2e9a3fdd49a18270af278c Mon Sep 17 00:00:00 2001
From: Victor Morales <victor.morales@intel.com>
Date: Wed, 9 Aug 2017 10:50:44 -0500
Subject: Fix non-proxy maven configuration

There is an error caused when OParent is used as an option without a
proxy configuration. This commit changes the way to print those tags.

Change-Id: I5300241b2d933832425edcd5a2544ec3f5ce6ff0
Signed-off-by: Victor Morales <victor.morales@intel.com>
---
 bootstrap/vagrant-onap/lib/_onap_functions    | 6 +++---
 bootstrap/vagrant-onap/lib/files/settings.xml | 4 ++--
 bootstrap/vagrant-onap/tools/Run.ps1          | 9 +++++++--
 bootstrap/vagrant-onap/tools/run.sh           | 3 +++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bootstrap/vagrant-onap/lib/_onap_functions b/bootstrap/vagrant-onap/lib/_onap_functions
index 2c349d2c2..12ac1768b 100755
--- a/bootstrap/vagrant-onap/lib/_onap_functions
+++ b/bootstrap/vagrant-onap/lib/_onap_functions
@@ -51,9 +51,9 @@ function _configure_maven {
     local mvn_https=""
 
     if [ $http_proxy ] | [ $https_proxy ]; then
-        proxies_start="   "
+        proxies_start="   <proxies>"
         proxies="   "
-        proxies_end="   "
+        proxies_end="   <\/proxies>"
         if [ $http_proxy ]; then
             proxy_domain=`echo $http_proxy | awk -F/ '{print $3}' | awk -F: '{print $1}'`
             proxy_port=`echo $http_proxy | awk -F/ '{print $3}' | awk -F: '{print $2}'`
@@ -70,7 +70,7 @@ function _configure_maven {
         if [[ "$enable_oparent" == "True" ]]; then
             clone_repo oparent
             cp $git_src_folder/oparent/settings.xml $mvn_conf_file
-            sed -i "s|<\/profiles>|<\/profiles>\n%PROXIES_START% <proxies>\n%PROXIES% %HTTP_PROXY%\n%PROXIES% %HTTPS_PROXY%\n%PROXIES_END%  <\/proxies>|g" $mvn_conf_file
+            sed -i "s|<\/profiles>|<\/profiles>\n%PROXIES_START%\n%PROXIES% %HTTP_PROXY%\n%PROXIES% %HTTPS_PROXY%\n%PROXIES_END%|g" $mvn_conf_file
         else
             cp /var/onap/files/settings.xml $mvn_conf_file
         fi
diff --git a/bootstrap/vagrant-onap/lib/files/settings.xml b/bootstrap/vagrant-onap/lib/files/settings.xml
index a3b972446..862a3e865 100644
--- a/bootstrap/vagrant-onap/lib/files/settings.xml
+++ b/bootstrap/vagrant-onap/lib/files/settings.xml
@@ -9,10 +9,10 @@
 		to connect to the network. | Unless otherwise specified (by system property 
 		or command-line switch), the first proxy | specification in this list marked 
 		as active will be used. | -->
-%PROXIES_START%<proxies>
+%PROXIES_START%
 %PROXIES% %HTTP_PROXY%
 %PROXIES% %HTTPS_PROXY%
-%PROXIES_END%</proxies>
+%PROXIES_END%
 	<!-- mirrors | This is a list of mirrors to be used in downloading artifacts 
 		from remote repositories. | | It works like this: a POM may declare a repository 
 		to use in resolving certain artifacts. | However, this repository may have 
diff --git a/bootstrap/vagrant-onap/tools/Run.ps1 b/bootstrap/vagrant-onap/tools/Run.ps1
index 55adc11c9..5469abfd7 100644
--- a/bootstrap/vagrant-onap/tools/Run.ps1
+++ b/bootstrap/vagrant-onap/tools/Run.ps1
@@ -12,8 +12,13 @@ switch ($args[0])
                 if (!$args[2]) { $test_case=$args[2] }
                 $env:TEST_CASE=$test_case
 
-                rm ./opt/ -Recurse -Force
-                rm $HOME/.m2/ -Recurse -Force
+                Remove-Item ./opt/ -Recurse -Force
+                Remove-Item $HOME/.m2/ -Recurse -Force
+             }
+         default
+             {
+                Write-Output $"Usage: $0 {all_in_one|dns|mr|sdc|aai|mso|robot|vid|sdnc|portal|dcae|policy|appc|testing}"
+                exit 1
              }
     }
 
diff --git a/bootstrap/vagrant-onap/tools/run.sh b/bootstrap/vagrant-onap/tools/run.sh
index e192ba171..b9a4a4311 100755
--- a/bootstrap/vagrant-onap/tools/run.sh
+++ b/bootstrap/vagrant-onap/tools/run.sh
@@ -12,6 +12,9 @@ case $1 in
 
         rm -rf ../opt/
         rm -rf ~/.m2/;;
+    * )
+        echo $"Usage: $0 {all_in_one|dns|mr|sdc|aai|mso|robot|vid|sdnc|portal|dcae|policy|appc|testing}"
+        exit 1
 esac
 vagrant destroy -f $1
 vagrant up $1
-- 
cgit 1.2.3-korg