[POLICY-26] add prereq software

Added software necessary to use CLI.
The software installed provides useful software across policy
containers.

Change-Id: I53e300c4b55103df89dc3a202d59bc5cf2d43629
Signed-off-by: Jorge Hernandez <jh1730@att.com>

diff --git a/config/pe/push-policies.sh b/config/pe/push-policies.sh
index 313eaf8..11e2789 100644 (file)
--- a/config/pe/push-policies.sh
+++ b/config/pe/push-policies.sh
@@ -7,7 +7,7 @@ echo "Pushing default policies"
 # so for the BRMS policies we will do a push, then delete from the pdp group, then push again.
 # Second push should be successful.
 
-curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
   "pdpGroup": "default",
   "policyName": "com.vFirewall",
   "policyType": "MicroService"
@@ -15,14 +15,14 @@ curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/pla
 
 sleep 2
 
-curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
   "pdpGroup": "default",
   "policyName": "com.vLoadBalancer",
   "policyType": "MicroService"
 }' 'http://pdp:8081/pdp/api/pushPolicy' 
 
 sleep 2
-curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
   "pdpGroup": "default",
   "policyName": "com.BRMSParamvLBDemoPolicy",
   "policyType": "BRMS_Param"
@@ -30,7 +30,7 @@ curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/pla
 
 sleep 2
 
-curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
   "pdpGroup": "default",
   "policyName": "com.BRMSParamvFWDemoPolicy",
   "policyType": "BRMS_Param"
@@ -38,7 +38,7 @@ curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/pla
 
 sleep 2
 
-curl -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+curl -v --silent -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
 "pdpGroup": "default",
 "policyComponent": "PDP",
 "policyName": "com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml"
@@ -46,14 +46,14 @@ curl -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/
 
 
 
-curl -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+curl -v --silent -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
 "pdpGroup": "default",
 "policyComponent": "PDP",
 "policyName": "com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml"
 }' 'http://pdp:8081/pdp/api/deletePolicy'
 
 sleep 2
-curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
   "pdpGroup": "default",
   "policyName": "com.BRMSParamvLBDemoPolicy",
   "policyType": "BRMS_Param"
@@ -61,7 +61,7 @@ curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/pla
 
 sleep 2
 
-curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
   "pdpGroup": "default",
   "policyName": "com.BRMSParamvFWDemoPolicy",
   "policyType": "BRMS_Param"

diff --git a/policy-drools/do-start.sh b/policy-drools/do-start.sh
index 7fead2f..bc20e4e 100644 (file)
--- a/policy-drools/do-start.sh
+++ b/policy-drools/do-start.sh
@@ -37,6 +37,8 @@ else
        ./wait-for-port.sh mariadb 3306
        # now that DB is up, invoke database upgrade:
        # sql provisioning scripts should be invoked here.
+
+       pip install http-prompt
 fi
 
 echo "Starting processes"

diff --git a/policy-os/Dockerfile b/policy-os/Dockerfile
index 8ae51d9..92fd057 100644 (file)
--- a/policy-os/Dockerfile
+++ b/policy-os/Dockerfile
@@ -5,6 +5,8 @@ RUN \
        apt-get update && \
        apt-get install -y zip unzip curl wget ssh telnet maven && \
        apt-get install -y software-properties-common && \
+       apt-get install -y jq httpie && \
+       apt-get install -y python-pip && \
        add-apt-repository ppa:openjdk-r/ppa && \
        apt-get clean && \
        apt-get update && \