policy/docker changes to support PE https

Made changes to conf files and push-policies.sh to set variables and use
https in urls

Change-Id: I319e800a33756e771f57a8ef8bd611925fdd9299
Issue-ID: POLICY-781
Signed-off-by: Michael Mokry <mm117s@att.com>

7 files changed, 27 insertions, 27 deletions

diff --git a/config/pe/brmsgw.conf b/config/pe/brmsgw.conf
index 3fccb937..0218e2ff 100644
--- a/config/pe/brmsgw.conf
+++ b/config/pe/brmsgw.conf
@@ -17,8 +17,8 @@ BRMSGW_JMX_PORT=9989
 COMPONENT_X_MX_MB=1024
 COMPONENT_X_MS_MB=1024
 
-REST_PAP_URL=http://pap:9091/pap/
-REST_PDP_ID=http://pdp:8081/pdp/
+REST_PAP_URL=https://pap:9091/pap/
+REST_PDP_ID=https://pdp:8081/pdp/
 
 PDP_HTTP_USER_ID=testpdp
 PDP_HTTP_PASSWORD=alpha123
diff --git a/config/pe/console.conf b/config/pe/console.conf
index f07b93f1..d8b4f045 100644
--- a/config/pe/console.conf
+++ b/config/pe/console.conf
@@ -90,7 +90,7 @@ REFRESH_RATE=40000
 #
 
 
-REST_PAP_URL=http://pap:9091/pap/
+REST_PAP_URL=https://pap:9091/pap/
 
 #
 # Config/Action Properties location.
@@ -98,7 +98,7 @@ REST_PAP_URL=http://pap:9091/pap/
 
 REST_CONFIG_HOME=${{POLICY_HOME}}/servers/pap/webapps/Config/
 REST_ACTION_HOME=${{POLICY_HOME}}/servers/pap/webapps/Action/
-REST_CONFIG_URL=http://pap:9091/
+REST_CONFIG_URL=https://pap:9091/
 REST_CONFIG_WEBAPPS=${{POLICY_HOME}}/servers/pap/webapps/
 
 # PAP account information
diff --git a/config/pe/pap.conf b/config/pe/pap.conf
index 3ff5038d..d0dcbe6e 100644
--- a/config/pe/pap.conf
+++ b/config/pe/pap.conf
@@ -27,7 +27,7 @@ TOMCAT_X_MX_MB=1024
 # pap properties
 
 PAP_PDPS=${{POLICY_HOME}}/servers/pap/bin/pdps
-PAP_URL=http://pap:9091/pap/
+PAP_URL=https://pap:9091/pap/
 
 PAP_INITIATE_PDP=true
 PAP_HEARTBEAT_INTERVAL=10000
@@ -39,7 +39,7 @@ REST_ADMIN_WORKSPACE=workspace
 
 # PDP related properties
 
-PAP_PDP_URL=http://pdp:8081/pdp/
+PAP_PDP_URL=https://pdp:8081/pdp/
 PAP_PDP_HTTP_USER_ID=testpdp
 PAP_PDP_HTTP_PASSWORD=alpha123
 
diff --git a/config/pe/paplp.conf b/config/pe/paplp.conf
index 92e5b547..91567af5 100644
--- a/config/pe/paplp.conf
+++ b/config/pe/paplp.conf
@@ -16,7 +16,7 @@ LOGPARSER_JMX_PORT=9996
 LOGPARSER_X_MS_MB=1024
 LOGPARSER_X_MX_MB=1024
 
-SERVER=http://pap:9091/pap/
+SERVER=https://pap:9091/pap/
 LOGPATH=/var/log/onap/policy/pap/pap-rest.log
 PARSERLOGPATH=${{POLICY_HOME}}/servers/paplp/bin/IntegrityMonitor.log
 
diff --git a/config/pe/pdp.conf b/config/pe/pdp.conf
index 66e090fd..52a962ee 100644
--- a/config/pe/pdp.conf
+++ b/config/pe/pdp.conf
@@ -28,8 +28,8 @@ TOMCAT_X_MX_MB=1024
 
 UEB_CLUSTER=vm1.mr.simpledemo.onap.org
 
-REST_PAP_URL=http://pap:9091/pap/
-REST_PDP_ID=http://pdp:8081/pdp/
+REST_PAP_URL=https://pap:9091/pap/
+REST_PDP_ID=https://pdp:8081/pdp/
 REST_PDP_CONFIG=${{POLICY_HOME}}/servers/pdp/bin/config
 REST_PDP_WEBAPPS=${{POLICY_HOME}}/servers/pdp/webapps
 REST_PDP_REGISTER=true
diff --git a/config/pe/pdplp.conf b/config/pe/pdplp.conf
index 24b60c1f..e4bc043e 100644
--- a/config/pe/pdplp.conf
+++ b/config/pe/pdplp.conf
@@ -16,7 +16,7 @@ LOGPARSER_JMX_PORT=9997
 LOGPARSER_X_MS_MB=1024
 LOGPARSER_X_MX_MB=1024
 
-SERVER=http://pdp:8081/pdp/
+SERVER=https://pdp:8081/pdp/
 LOGPATH=/var/log/onap/policy/pdpx/pdp-rest.log
 PARSERLOGPATH=${{POLICY_HOME}}/servers/pdplp/bin/IntegrityMonitor.log
 
diff --git a/config/pe/push-policies.sh b/config/pe/push-policies.sh
index 90c60e79..ed138991 100755
--- a/config/pe/push-policies.sh
+++ b/config/pe/push-policies.sh
@@ -23,7 +23,7 @@ wget -O cl-amsterdam-template.drl https://git.onap.org/policy/drools-application
 
 sleep 2
 
-curl -v --silent -X POST --header 'Content-Type: multipart/form-data' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -F "file=@cl-amsterdam-template.drl" -F "importParametersJson={\"serviceName\":\"ClosedLoopControlName\",\"serviceType\":\"BRMSPARAM\"}" 'http://pdp:8081/pdp/api/policyEngineImport' 
+curl -v --silent -X POST --header 'Content-Type: multipart/form-data' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -F "file=@cl-amsterdam-template.drl" -F "importParametersJson={\"serviceName\":\"ClosedLoopControlName\",\"serviceType\":\"BRMSPARAM\"}" 'https://pdp:8081/pdp/api/policyEngineImport' 
 
 echo "PRELOAD_POLICIES is $PRELOAD_POLICIES"
 
@@ -53,7 +53,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
 			"controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+Eace933104d443b496b8.nodes.heat.vpg%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
 		}
 	}
-}' 'http://pdp:8081/pdp/api/createPolicy'
+}' 'https://pdp:8081/pdp/api/createPolicy'
 
 sleep 2
 
@@ -73,7 +73,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
 			"controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3%0D%0A++trigger_policy%3A+unique-policy-id-1-scale-up%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-scale-up%0D%0A++++name%3A+Create+a+new+VF+Module%0D%0A++++description%3A%0D%0A++++actor%3A+SO%0D%0A++++recipe%3A+VF+Module+Create%0D%0A++++target%3A%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
 		}
 	}
-}' 'http://pdp:8081/pdp/api/createPolicy'
+}' 'https://pdp:8081/pdp/api/createPolicy'
 
 sleep 2
 
@@ -93,7 +93,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
 			"controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+VFC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
 		}
 	}
-}' 'http://pdp:8081/pdp/api/createPolicy'
+}' 'https://pdp:8081/pdp/api/createPolicy'
 
 sleep 2
 
@@ -113,7 +113,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
 			"controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+true%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
 		}
 	}
-}' 'http://pdp:8081/pdp/api/createPolicy'
+}' 'https://pdp:8081/pdp/api/createPolicy'
 
 #########################################Create Micro Service Config policies##########################################
 
@@ -127,7 +127,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
 	"policyConfigType": "MicroService",
 	"policyName": "com.MicroServicevFirewall",
 	"onapName": "DCAE"
-}' 'http://pdp:8081/pdp/api/createPolicy'
+}' 'https://pdp:8081/pdp/api/createPolicy'
 
 
 sleep 2
@@ -138,7 +138,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
 	"policyConfigType": "MicroService",
 	"policyName": "com.MicroServicevDNS",
 	"onapName": "DCAE"
-}' 'http://pdp:8081/pdp/api/createPolicy'
+}' 'https://pdp:8081/pdp/api/createPolicy'
 
 
 sleep 2
@@ -149,7 +149,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
 	"policyConfigType": "MicroService",
 	"policyName": "com.MicroServicevCPE",
 	"onapName": "DCAE"
-}' 'http://pdp:8081/pdp/api/createPolicy'
+}' 'https://pdp:8081/pdp/api/createPolicy'
 
 
 #########################################Creating Decision Guard policy######################################### 
@@ -176,7 +176,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
 			"guardActiveEnd": "00:00:00-05:00" 
 		} 
 	} 
-}' 'http://pdp:8081/pdp/api/createPolicy'
+}' 'https://pdp:8081/pdp/api/createPolicy'
 
 #########################################Push Decision policy#########################################
 
@@ -187,7 +187,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "pdpGroup": "default", 
   "policyName": "com.AllPermitGuard", 
   "policyType": "DECISION" 
-}' 'http://pdp:8081/pdp/api/pushPolicy'
+}' 'https://pdp:8081/pdp/api/pushPolicy'
 
 #########################################Pushing BRMS Param policies##########################################
 
@@ -200,7 +200,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "pdpGroup": "default",
   "policyName": "com.BRMSParamvFirewall",
   "policyType": "BRMS_Param"
-}' 'http://pdp:8081/pdp/api/pushPolicy'
+}' 'https://pdp:8081/pdp/api/pushPolicy'
 
 sleep 2
 
@@ -209,7 +209,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "pdpGroup": "default",
   "policyName": "com.BRMSParamvDNS",
   "policyType": "BRMS_Param"
-}' 'http://pdp:8081/pdp/api/pushPolicy'
+}' 'https://pdp:8081/pdp/api/pushPolicy'
 
 sleep 2
 
@@ -218,7 +218,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "pdpGroup": "default",
   "policyName": "com.BRMSParamVOLTE",
   "policyType": "BRMS_Param"
-}' 'http://pdp:8081/pdp/api/pushPolicy'
+}' 'https://pdp:8081/pdp/api/pushPolicy'
 
 sleep 2
 
@@ -227,7 +227,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "pdpGroup": "default",
   "policyName": "com.BRMSParamvCPE",
   "policyType": "BRMS_Param"
-}' 'http://pdp:8081/pdp/api/pushPolicy'
+}' 'https://pdp:8081/pdp/api/pushPolicy'
 
 #########################################Pushing MicroService Config policies##########################################
 
@@ -240,7 +240,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "pdpGroup": "default",
   "policyName": "com.MicroServicevFirewall",
   "policyType": "MicroService"
-}' 'http://pdp:8081/pdp/api/pushPolicy'
+}' 'https://pdp:8081/pdp/api/pushPolicy'
 
 sleep 10
 
@@ -249,7 +249,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "pdpGroup": "default",
   "policyName": "com.MicroServicevDNS",
   "policyType": "MicroService"
-}' 'http://pdp:8081/pdp/api/pushPolicy' 
+}' 'https://pdp:8081/pdp/api/pushPolicy' 
 
 sleep 10
 
@@ -258,4 +258,4 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "pdpGroup": "default",
   "policyName": "com.MicroServicevCPE",
   "policyType": "MicroService"
-}' 'http://pdp:8081/pdp/api/pushPolicy' 
+}' 'https://pdp:8081/pdp/api/pushPolicy'