From 249b2c06fb63e42efcfbb1a2c60004789b4f9c8d Mon Sep 17 00:00:00 2001
From: Hector Anapan <ha076r@att.com>
Date: Wed, 16 Aug 2017 14:56:54 -0400
Subject: [PATCH] Changing AAIService Bundle to use AAI Properties

This code changes the docker-compose.yml's SDNC_CONFIG_DIR env.variable in the "appc" service that deploys the appc container to point to appc's aaiclient.properties instead of the sdnc's aiiclient.properties. In doing so, some properties had to be moved to the new SDNC_CONFIG_DIR's appc properties folder path so SDNC karaf features are installed correctly. Also, replacing the AAIClient p12 keystore by converting the validated jks file to this new p12 keystore certificate.

Change-Id: I6ee5bd56f4403cb575fdc93ded8eebc6a7a5cc4b
Signed-off-by: Hector Anapan <ha076r@att.com>
Issue: [APPC-129]
---
 docker-compose/docker-compose.yml                  |   8 +++---
 .../src/main/properties/mdsal-resource.properties  |  25 ++++++++++++++++++
 .../src/main/properties/sql-resource.properties    |  21 ++++++++++++++++
 .../src/main/properties/svclogic.properties        |  28 +++++++++++++++++++++
 installation/src/main/stores/keystore.client.p12   | Bin 5652 -> 0 bytes
 .../src/main/stores/keystore.clientnew.p12         | Bin 0 -> 3488 bytes
 .../installer/src/main/scripts/setenv.sh           |  15 ++++++-----
 7 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 installation/src/main/properties/mdsal-resource.properties
 create mode 100644 installation/src/main/properties/sql-resource.properties
 create mode 100644 installation/src/main/properties/svclogic.properties
 delete mode 100644 installation/src/main/stores/keystore.client.p12
 create mode 100644 installation/src/main/stores/keystore.clientnew.p12

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index d431e66..11e4669 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -21,7 +21,9 @@ services:
         max-size: "30m"
         max-file: "5"
 
-      
+# Tweaking SDNC_CONFIG_DIR temporarily from ../sdnc/.. to ../appc/.. since it may be needed in this script
+#    to map to SDN-C AAI Service Bundle's AAI Activator class inside the gerrit sdnc/adaptors repo, so that
+#    the AAI Service bundle loads APP-C's aaiclient.properties instead of SDN-C's aaiclient.properties.
   appc:
     image: "openecomp/appc-image:latest"
     depends_on :
@@ -37,7 +39,7 @@ services:
       - db:sdnctldb02
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
+      - SDNC_CONFIG_DIR=/opt/openecomp/appc/data/properties
       - APPC_CONFIG_DIR=/opt/openecomp/appc/data/properties
       - DMAAP_TOPIC_ENV=SUCCESS
     logging:
@@ -66,9 +68,9 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
-      - APPC_CONFIG_DIR=/opt/openecomp/appc/data/properties
     logging:
       driver: "json-file"
       options:
         max-size: "30m"
         max-file: "5"
+
diff --git a/installation/src/main/properties/mdsal-resource.properties b/installation/src/main/properties/mdsal-resource.properties
new file mode 100644
index 0000000..7f015f4
--- /dev/null
+++ b/installation/src/main/properties/mdsal-resource.properties
@@ -0,0 +1,25 @@
+###
+# ============LICENSE_START=======================================================
+# APPC
+# ================================================================================
+# Copyright (C) 2017 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.
+# ============LICENSE_END=========================================================
+###
+
+org.openecomp.sdnc.sli.resource.mdsal.sdnc-user=admin
+org.openecomp.sdnc.sli.resource.mdsal.sdnc-passwd=admin
+org.openecomp.sdnc.sli.resource.mdsal.sdnc-host=localhost
+org.openecomp.sdnc.sli.resource.mdsal.sdnc-protocol=http
+org.openecomp.sdnc.sli.resource.mdsal.sdnc-port=8181
diff --git a/installation/src/main/properties/sql-resource.properties b/installation/src/main/properties/sql-resource.properties
new file mode 100644
index 0000000..e1f4e38
--- /dev/null
+++ b/installation/src/main/properties/sql-resource.properties
@@ -0,0 +1,21 @@
+###
+# ============LICENSE_START=======================================================
+# APPC
+# ================================================================================
+# Copyright (C) 2017 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.
+# ============LICENSE_END=========================================================
+###
+
+org.openecomp.sdnc.resource.sql.cryptkey=QtfJMKggVk
diff --git a/installation/src/main/properties/svclogic.properties b/installation/src/main/properties/svclogic.properties
new file mode 100644
index 0000000..83ebae9
--- /dev/null
+++ b/installation/src/main/properties/svclogic.properties
@@ -0,0 +1,28 @@
+###
+# ============LICENSE_START=======================================================
+# APPC
+# ================================================================================
+# Copyright (C) 2017 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.
+# ============LICENSE_END=========================================================
+###
+
+org.openecomp.sdnc.sli.dbtype = dblib
+#Note : the next 4 fields are only used if org.openecomp.sdnc.sli.dbtype = jdbc
+org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
+org.openecomp.sdnc.sli.jdbc.database=sdnctl
+org.openecomp.sdnc.sli.jdbc.user=sdnctl
+org.openecomp.sdnc.sli.jdbc.password=gamma
+
+org.xml.sax.driver=org.apache.xerces.parsers.SAXParser
diff --git a/installation/src/main/stores/keystore.client.p12 b/installation/src/main/stores/keystore.client.p12
deleted file mode 100644
index 5efffb3bc5b035f1b2aafe4d70dc25f4293c70f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5652
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

diff --git a/installation/src/main/stores/keystore.clientnew.p12 b/installation/src/main/stores/keystore.clientnew.p12
new file mode 100644
index 0000000000000000000000000000000000000000..932889e5a731757647804fa52ca5fb9f2cc6a133
GIT binary patch
literal 3488
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
OEg>U<jrINl0t5i1x1Z7g

literal 0
HcmV?d00001

diff --git a/platform-logic/installer/src/main/scripts/setenv.sh b/platform-logic/installer/src/main/scripts/setenv.sh
index 5484048..fbbdefa 100644
--- a/platform-logic/installer/src/main/scripts/setenv.sh
+++ b/platform-logic/installer/src/main/scripts/setenv.sh
@@ -21,15 +21,18 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ###
 
-SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/sdnc/data/properties}
+# Tweaking SDNC_CONFIG_DIR temporarily from ../sdnc/.. to ../appc/.. since it may be needed in this script
+#    to map to SDN-C AAI Service Bundle's AAI Activator class inside the gerrit sdnc/adaptors repo, so that
+#    the AAI Service bundle loads APP-C's aaiclient.properties instead of SDN-C's aaiclient.properties.
+SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/appc/data/properties}
 APPC_CONFIG_DIR=${APPC_CONFIG_DIR:-/opt/appc/data/properties}
 
-AAIURI=$(grep org.openecomp.sdnc.sli.aai.uri ${APPC_CONFIG_DIR}/aaiclient.properties | grep -v '#' | cut -d'=' -f2)
+AAIURI=$(grep org.openecomp.sdnc.sli.aai.uri ${SDNC_CONFIG_DIR}/aaiclient.properties | grep -v '#' | cut -d'=' -f2)
 
-MYSQL_USER=$(grep org.openecomp.sdnc.sli.jdbc.user ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
-MYSQL_PWD=$(grep org.openecomp.sdnc.sli.jdbc.password ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
-MYSQL_DB=$(grep org.openecomp.sdnc.sli.jdbc.database ${APPCC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
-MYSQL_SERVER=$(grep org.openecomp.sdnc.sli.jdbc.hosts ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2 | cut -d',' -f1)
+MYSQL_USER=$(grep org.openecomp.sdnc.sli.jdbc.user ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
+MYSQL_PWD=$(grep org.openecomp.sdnc.sli.jdbc.password ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
+MYSQL_DB=$(grep org.openecomp.sdnc.sli.jdbc.database ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
+MYSQL_SERVER=$(grep org.openecomp.sdnc.sli.jdbc.hosts ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2 | cut -d',' -f1)
 
 ODLUSER=$(grep controllerUser ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2)
 ODLPWD=$(grep controllerPass ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2)
-- 
2.16.6