Fix python script

Fix startup of the python script in the pom that was not properly set

Issue-ID: CLAMP-147
Change-Id: Ia462be79dd053a9b39761e5bdf3248d0e28e65ee
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

diff --git a/pom.xml b/pom.xml
index 70563ef..d340341 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
                                <skip.docker.build>true</skip.docker.build>
                                <skip.docker.push>true</skip.docker.push>
                                <skip.staging.artifacts>false</skip.staging.artifacts>
-                               <http.proxy></http.proxy>
+                               <python.http.proxy.param></python.http.proxy.param>
                </properties>
 
                <distributionManagement>
@@ -830,7 +830,7 @@
                                                                                                                                </ports>
                                                                                                                                <workingDir>/usr/src/http-cache-app</workingDir>
                                                                                                                                <cmd>
-                                                                                                                                               <shell>./start_http_cache.sh ${http.proxy} --python_proxyaddress localhost:${docker.http-cache.port.host}</shell>
+                                                                                                                                               <shell>./start_http_cache.sh ${python.http.proxy.param} --python_proxyaddress=localhost:${docker.http-cache.port.host}</shell>
                                                                                                                                </cmd>
                                                                                                                </run>
                                                                                                </image>

diff --git a/src/test/resources/http-cache/start_http_cache.sh b/src/test/resources/http-cache/start_http_cache.sh
index 0f32c93..fb4975e 100755 (executable)
--- a/src/test/resources/http-cache/start_http_cache.sh
+++ b/src/test/resources/http-cache/start_http_cache.sh
@@ -22,17 +22,18 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ###
 
+echo "Starting HTTP CACHE python script"
 for i in "$@"
 do
 case $i in
-    --python_proxyaddress=*)
+     --python_proxyaddress=*)
       python_proxyaddress="--proxyaddress ${i#*=}"
       echo "- Using python_proxyaddress and set it to: $python_proxyaddress"
       shift # past argument=value
       ;;
-    --http_proxyaddress=*)
+     --http_proxyaddress=*)
       export http_proxy="${i#*=}"
-      export https_proxy=$http_proxy
+      export https_proxy="${i#*=}"
       echo "- Defining http_proxy/https_proxy env variables to: $http_proxy"
       shift # past argument=value
       ;;