From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Mon, 9 Apr 2018 15:56:53 +0000 (+0200)
Subject: Fix python script
X-Git-Tag: v2.0.0~57^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=885d7c164e99e069c9a6c2827e479e1d8fee616e;p=clamp.git

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 70563efd..d340341c 100644
--- 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 0f32c93a..fb4975e5 100755
--- 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
       ;;