From 234a998a34c44e97533827076a32f8d972fc93da Mon Sep 17 00:00:00 2001
From: Michael Arrastia <MArrasti@amdocs.com>
Date: Mon, 5 Mar 2018 13:33:35 +0000
Subject: [PATCH] Add champ-service configuration

Define environment specific configuration in champ-beans.xml
(test-config/champ-service/dynamic/conf/champ-beans.xml):
Graph host:
  key="storage.hostname" value="aai.hbase.simpledemo.onap.org"
Graph port:
  key="storage.hbase.ext.hbase.zookeeper.property.clientPort"
  value="2181"
  key="storage.port" value="2181"
Event bus host:
  name="host" value="mr.api.simpledemo.openecomp.org:3904"

Change-Id: I7c9c029047dd402dcd4a9d4023c33c532cf07e10
Issue-ID: AAI-815
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
---
 champ-service/appconfig/auth/champ_policy.json |  18 ++++++
 champ-service/appconfig/auth/tomcat_keystore   | Bin 0 -> 2214 bytes
 champ-service/appconfig/champ-api.properties   |   7 +++
 champ-service/dynamic/conf/champ-beans.xml     |  80 +++++++++++++++++++++++++
 deploy_vm1.sh                                  |  12 ++++
 docker-compose-app.yml                         |  27 ++++++++-
 6 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 champ-service/appconfig/auth/champ_policy.json
 create mode 100644 champ-service/appconfig/auth/tomcat_keystore
 create mode 100644 champ-service/appconfig/champ-api.properties
 create mode 100644 champ-service/dynamic/conf/champ-beans.xml

diff --git a/champ-service/appconfig/auth/champ_policy.json b/champ-service/appconfig/auth/champ_policy.json
new file mode 100644
index 0000000..a39a146
--- /dev/null
+++ b/champ-service/appconfig/auth/champ_policy.json
@@ -0,0 +1,18 @@
+{
+	"roles": [
+		{
+			"name": "admin",
+			"functions": [
+				{
+					"name": "champ", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ]
+				}
+			],
+
+			"users": [
+				{
+					"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"
+				}
+			]
+		}
+	]
+}
diff --git a/champ-service/appconfig/auth/tomcat_keystore b/champ-service/appconfig/auth/tomcat_keystore
new file mode 100644
index 0000000000000000000000000000000000000000..9eec841aa2c1243b5ca3e22b0b116e5bca2afd49
GIT binary patch
literal 2214
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

literal 0
HcmV?d00001

diff --git a/champ-service/appconfig/champ-api.properties b/champ-service/appconfig/champ-api.properties
new file mode 100644
index 0000000..9ad9b33
--- /dev/null
+++ b/champ-service/appconfig/champ-api.properties
@@ -0,0 +1,7 @@
+Replace with your actual properties file. Should contain something like:
+
+keyName=aai-uuid
+sourceOfTruthName=source-of-truth
+createdTsName=aai-created-ts
+lastModTsName=aai-last-mod-ts
+collectionPropertiesKey=properties
\ No newline at end of file
diff --git a/champ-service/dynamic/conf/champ-beans.xml b/champ-service/dynamic/conf/champ-beans.xml
new file mode 100644
index 0000000..28b4d8c
--- /dev/null
+++ b/champ-service/dynamic/conf/champ-beans.xml
@@ -0,0 +1,80 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/util
+       http://www.springframework.org/schema/util/spring-util.xsd
+       ">
+
+
+    <bean id="champEventPublisher" class="com.att.ecomp.event.client.DMaaPEventPublisher">
+        <constructor-arg name="host" value="mr.api.simpledemo.openecomp.org:3904"/>
+        <constructor-arg name="topic" value="champRawEventsOnap"/>
+        <constructor-arg name="username" value="test"/>
+        <constructor-arg name="password" value="test"/>
+        <constructor-arg name="maxBatchSize" value="100"/>
+        <constructor-arg name="maxAgeMs" value="250"/>
+        <constructor-arg name="delayBetweenBatchesMs" value="50"/>
+        <constructor-arg name="transportType" value="HTTPAUTH"/>
+    </bean>
+
+    <!-- Graph Implementation Configuration-->
+    <util:map id="props" map-class="java.util.HashMap" key-type="java.lang.String" value-type="java.lang.Object">
+        <entry key="champcore.event.stream.buffer.capacity" value="50" value-type="java.lang.Integer"/>
+        <entry key="champcore.event.stream.publisher-pool-size" value="10" value-type="java.lang.Integer"/>
+        <entry key="champcore.event.stream.publisher" value-ref="champEventPublisher"/>
+
+        <entry key="graph.name" value="aaigraph-onap.dev"/>
+        <entry key="storage.backend" value="hbase"/>
+        <entry key="storage.hostname" value="aai.hbase.simpledemo.onap.org"/>
+
+        <!-- Hbase Config -->
+        <entry key="storage.hbase.ext.hbase.zookeeper.property.clientPort" value="2181"/>
+        <entry key="storage.hbase.ext.zookeeper.znode.parent" value="/hbase-unsecure"/>
+
+        <!-- Cassandra Config -->
+        <entry key="storage.port" value="2181"/>
+    </util:map>
+
+    <!-- Titan Implementation -->
+    <bean id="graphBuilder" class="org.onap.aai.champtitan.graph.impl.TitanChampGraphImpl$Builder">
+        <constructor-arg value="aaigraph-onap.dev"/>
+        <constructor-arg ref="props" />
+    </bean>
+    <bean id="graphImpl" class="org.onap.aai.champtitan.graph.impl.TitanChampGraphImpl">
+        <constructor-arg ref="graphBuilder" />
+    </bean>
+
+    <!-- Janus Implementation -->
+<!--
+    <bean id="graphBuilder" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl$Builder">
+        <constructor-arg value="<%= @CHAMP_GRAPH_NAME %>"/>
+        <constructor-arg ref="props"/>
+    </bean>
+    <bean id="graphImpl" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl">
+        <constructor-arg ref="graphBuilder"/>
+    </bean>
+-->
+
+    <bean id="champUUIDService" class="org.onap.champ.service.ChampUUIDService">
+        <constructor-arg name="graphImpl" ref="graphImpl"/>
+    </bean>
+
+    <bean id="cache" class="org.onap.champ.service.ChampTransactionCache">
+        <constructor-arg name="txTimeOutInSec" value="600"/>
+        <constructor-arg name="graphImpl" ref="graphImpl"/>
+    </bean>
+
+    <bean id="champDataService" class="org.onap.champ.service.ChampDataService">
+        <constructor-arg name="champUUIDService" ref="champUUIDService"/>
+        <constructor-arg name="graphImpl" ref="graphImpl"/>
+        <constructor-arg name="cache" ref="cache"/>
+    </bean>
+
+    <bean id="champRestService" class="org.onap.champ.ChampRESTAPI">
+        <constructor-arg name="champDataService" ref="champDataService"/>
+        <constructor-arg name="champAsyncRequestProcessor" ref="champAsyncRequestProcessor"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index a5a25d2..2c1376b 100755
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -13,6 +13,7 @@ export SEARCH_LOGS="/opt/aai/logroot/AAI-SEARCH";
 export DATA_ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER";
 export MODEL_LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER";
 export UI_LOGS="/opt/aai/logroot/AAI-UI";
+export CHAMP_LOGS="/opt/aai/logroot/AAI-CHAMP-SERVICE";
 
 if [ ! -d "$RESOURCES_LOGS" ];
 then
@@ -50,6 +51,12 @@ then
     mkdir -p $UI_LOGS;
 fi;
 
+if [ ! -d "$CHAMP_LOGS" ];
+then
+    echo "Warning: Unable to find the volume directory $CHAMP_LOGS so creating it as regular directory";
+    mkdir -p $CHAMP_LOGS;
+fi;
+
 export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1);
 export DOCKER_REGISTRY="${DOCKER_REGISTRY:-localhost:5000}";
 export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-aaionap/haproxy}";
@@ -121,6 +128,9 @@ docker tag $DOCKER_REGISTRY/onap/model-loader:$DOCKER_IMAGE_VERSION $DOCKER_REGI
 docker pull ${DOCKER_REGISTRY}/onap/sparky-be:${DOCKER_IMAGE_VERSION};
 docker tag $DOCKER_REGISTRY/onap/sparky-be:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/onap/sparky-be:latest;
 
+docker pull ${DOCKER_REGISTRY}/onap/champ-service:${DOCKER_IMAGE_VERSION};
+docker tag $DOCKER_REGISTRY/onap/champ-service:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/onap/champ-service:latest;
+
 # cleanup
 $DOCKER_COMPOSE_CMD stop
 $DOCKER_COMPOSE_CMD rm -f -v
@@ -149,6 +159,8 @@ $DOCKER_COMPOSE_CMD up -d sparky-be
 
 $DOCKER_COMPOSE_CMD up -d model-loader datarouter aai.searchservice.simpledemo.openecomp.org
 
+$DOCKER_COMPOSE_CMD up -d champ-service
+
 echo "A&AI Microservices are successfully started";
 
 crontab < /opt/test-config/aaicrontab
diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 6a6ccff..912309f 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -124,7 +124,32 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-        
+
+  champ-service:
+    image: ${DOCKER_REGISTRY}/onap/champ-service
+    hostname: champ-service
+    volumes:
+      - ${CHAMP_LOGS}:/logs
+      - /opt/test-config/champ-service/appconfig:/opt/app/champ-service/config
+      - /opt/test-config/champ-service/dynamic:/opt/app/champ-service/dynamic
+    ports:
+      - 9522:9522
+    environment:
+      - CONFIG_HOME=/opt/app/champ-service/config/
+      - KEY_STORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - AJSC_JETTY_ThreadCount_MIN=5
+      - AJSC_JETTY_ThreadCount_MAX=200
+      - AJSC_JETTY_BLOCKING_QUEUE_SIZE=200
+      - MAX_HEAP=1024
+      - SERVICE_BEANS=/opt/app/champ-service/dynamic/conf
+      - GRAPHIMPL=titan-deps
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+
 networks:
   default:
       driver: bridge
-- 
2.16.6