13 files changed, 175 insertions, 6 deletions
diff --git a/config/pe/base.conf b/config/pe/base.conf
index f1c25e15..e5aec35f 100644
--- a/config/pe/base.conf
+++ b/config/pe/base.conf
@@ -1,6 +1,20 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 POLICY_HOME=/opt/app/policy
-KEYSTORE_PASSWD=PolicyR0ck$
+POLICY_LOGS=/var/log/onap
+KEYSTORE_PASSWD=Pol1cy_0nap
 
 JDBC_DRIVER=org.mariadb.jdbc.Driver
 JDBC_URL=jdbc:mariadb://mariadb:3306/onap_sdk?failOverReadOnly=false&autoReconnect=true
@@ -21,4 +35,4 @@ ENVIRONMENT=TEST
 
 #Micro Service Model Properties
 policy_msOnapName=
-policy_msPolicyName=
-\ No newline at end of file
+policy_msPolicyName=
diff --git a/config/pe/brmsgw-tweaks.sh b/config/pe/brmsgw-tweaks.sh
index daa3596e..426db9dd 100755
--- a/config/pe/brmsgw-tweaks.sh
+++ b/config/pe/brmsgw-tweaks.sh
@@ -1,4 +1,17 @@
 #! /bin/bash
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 PROPS_BUILD="${POLICY_HOME}/etc/build.info"
 
diff --git a/config/pe/brmsgw.conf b/config/pe/brmsgw.conf
index a84128ed..a976da7d 100644
--- a/config/pe/brmsgw.conf
+++ b/config/pe/brmsgw.conf
@@ -1,3 +1,16 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # BRMSpep component installation configuration parameters
 BRMSGW_JMX_PORT=9989
 
@@ -49,5 +62,5 @@ BRMS_UEB_API_KEY=
 BRMS_UEB_API_SECRET=
 
 #Dependency.json file version
-BRMS_DEPENDENCY_VERSION=1.1.0
+BRMS_DEPENDENCY_VERSION=1.2.0
 
diff --git a/config/pe/console.conf b/config/pe/console.conf
index 45ae3492..f07b93f1 100644
--- a/config/pe/console.conf
+++ b/config/pe/console.conf
@@ -1,3 +1,16 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # configs component installation configuration parameters
 
 # tomcat specific parameters
diff --git a/config/pe/elk.conf b/config/pe/elk.conf
index 938954ce..cd7b1a21 100644
--- a/config/pe/elk.conf
+++ b/config/pe/elk.conf
@@ -1,3 +1,16 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # elasticsearch
 
 ELK_JMX_PORT=9995
 \ No newline at end of file
diff --git a/config/pe/mysql.conf b/config/pe/mysql.conf
index 28b9e3ca..eb0be01c 100644
--- a/config/pe/mysql.conf
+++ b/config/pe/mysql.conf
@@ -1,3 +1,16 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # mysql scripts component installation configuration parameters
 
 # Path to mysql bin
diff --git a/config/pe/pap-tweaks.sh b/config/pe/pap-tweaks.sh
index 36ac3689..7c85010b 100755
--- a/config/pe/pap-tweaks.sh
+++ b/config/pe/pap-tweaks.sh
@@ -1 +1,14 @@
 #! /bin/bash
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/config/pe/pap.conf b/config/pe/pap.conf
index 084f127f..3ff5038d 100644
--- a/config/pe/pap.conf
+++ b/config/pe/pap.conf
@@ -1,3 +1,16 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # pap component installation configuration parameters
 
 # tomcat specific parameters
diff --git a/config/pe/paplp.conf b/config/pe/paplp.conf
index 9fdd643b..17a3407d 100644
--- a/config/pe/paplp.conf
+++ b/config/pe/paplp.conf
@@ -1,3 +1,16 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # JVM specific parameters
 LOGPARSER_JMX_PORT=9996
 LOGPARSER_X_MS_MB=1024
diff --git a/config/pe/pdp-tweaks.sh b/config/pe/pdp-tweaks.sh
index f6825363..7c85010b 100755
--- a/config/pe/pdp-tweaks.sh
+++ b/config/pe/pdp-tweaks.sh
@@ -1,2 +1,14 @@
 #! /bin/bash
-
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/config/pe/pdp.conf b/config/pe/pdp.conf
index c82c01a5..0759dcd7 100644
--- a/config/pe/pdp.conf
+++ b/config/pe/pdp.conf
@@ -1,3 +1,16 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # pdp component installation configuration parameters
 
 # tomcat specific parameters
diff --git a/config/pe/pdplp.conf b/config/pe/pdplp.conf
index 789d2b01..e51999f5 100644
--- a/config/pe/pdplp.conf
+++ b/config/pe/pdplp.conf
@@ -1,3 +1,16 @@
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # JVM specific parameters
 LOGPARSER_JMX_PORT=9997
 LOGPARSER_X_MS_MB=1024
diff --git a/config/pe/push-policies.sh b/config/pe/push-policies.sh
index 20e0bfaa..90c60e79 100755
--- a/config/pe/push-policies.sh
+++ b/config/pe/push-policies.sh
@@ -1,4 +1,17 @@
 #! /bin/bash
+# Copyright 2018 AT&T Intellectual Property. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 #########################################Upload BRMS Param Template##########################################
 
@@ -229,7 +242,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "policyType": "MicroService"
 }' 'http://pdp:8081/pdp/api/pushPolicy'
 
-sleep 2
+sleep 10
 
 echo "pushPolicy : PUT : com.MicroServicevDNS"
 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 '{
@@ -238,7 +251,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce
   "policyType": "MicroService"
 }' 'http://pdp:8081/pdp/api/pushPolicy' 
 
-sleep 2
+sleep 10
 
 echo "pushPolicy : PUT : com.MicroServicevCPE"
 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 '{