From 3352e2f1c37b5dadd756aada11ef0d822b2a32ca Mon Sep 17 00:00:00 2001
From: "Sanchez, Gabriel (gs882h)" <gabriel.sanchez@amdocs.com>
Date: Tue, 6 Mar 2018 17:46:21 +0000
Subject: [PATCH] Add Gizmo (crud-service) in test-config

Certs, drop pre-v11 and rename cert to champ

Issue-ID: AAI-836

Change-Id: I859ded7728bf206bc4cdde7ee02f93b942258b4e
Signed-off-by: gabriel.sanchez <gabriel.sanchez@amdocs.com>
---
 crud-service/appconfig/auth/champ-cert.p12         | Bin 0 -> 4357 bytes
 crud-service/appconfig/auth/crud_policy.json       |  18 +++++++++++++
 crud-service/appconfig/auth/tomcat_keystore        | Bin 0 -> 2214 bytes
 crud-service/appconfig/crud-api.properties         |   5 ++++
 .../appconfig/model/edge_properties_v11.json       |   6 +++++
 .../appconfig/model/edge_properties_v12.json       |   6 +++++
 crud-service/dynamic/conf/crud-beans.xml           |  30 +++++++++++++++++++++
 deploy_vm1.sh                                      |  12 +++++++++
 docker-compose-app.yml                             |  24 +++++++++++++++++
 9 files changed, 101 insertions(+)
 create mode 100644 crud-service/appconfig/auth/champ-cert.p12
 create mode 100644 crud-service/appconfig/auth/crud_policy.json
 create mode 100644 crud-service/appconfig/auth/tomcat_keystore
 create mode 100644 crud-service/appconfig/crud-api.properties
 create mode 100644 crud-service/appconfig/model/edge_properties_v11.json
 create mode 100644 crud-service/appconfig/model/edge_properties_v12.json
 create mode 100644 crud-service/dynamic/conf/crud-beans.xml

diff --git a/crud-service/appconfig/auth/champ-cert.p12 b/crud-service/appconfig/auth/champ-cert.p12
new file mode 100644
index 0000000000000000000000000000000000000000..ee57120fa0d5e5089c351930e668b87bde52e7e6
GIT binary patch
literal 4357
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

literal 0
HcmV?d00001

diff --git a/crud-service/appconfig/auth/crud_policy.json b/crud-service/appconfig/auth/crud_policy.json
new file mode 100644
index 0000000..d60312b
--- /dev/null
+++ b/crud-service/appconfig/auth/crud_policy.json
@@ -0,0 +1,18 @@
+{
+	"roles": [
+		{
+			"name": "admin",
+			"functions": [
+				{
+					"name": "crud", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" }, { "name": "PATCH" } ]
+				}
+			],
+
+			"users": [
+				{
+					"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"
+				}
+			]
+		}
+	]
+}
diff --git a/crud-service/appconfig/auth/tomcat_keystore b/crud-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/crud-service/appconfig/crud-api.properties b/crud-service/appconfig/crud-api.properties
new file mode 100644
index 0000000..2653302
--- /dev/null
+++ b/crud-service/appconfig/crud-api.properties
@@ -0,0 +1,5 @@
+# CRUD-API configuration
+
+crud.async.request.timeout=60000
+crud.async.response.process.poll.interval=1000
+crud.collection.properties.key=properties
\ No newline at end of file
diff --git a/crud-service/appconfig/model/edge_properties_v11.json b/crud-service/appconfig/model/edge_properties_v11.json
new file mode 100644
index 0000000..8d00636
--- /dev/null
+++ b/crud-service/appconfig/model/edge_properties_v11.json
@@ -0,0 +1,6 @@
+{
+        "contains-other-v": "java.lang.String",
+        "delete-other-v": "java.lang.String",
+        "SVC-INFRA": "java.lang.String",
+        "prevent-delete": "java.lang.String"
+}
\ No newline at end of file
diff --git a/crud-service/appconfig/model/edge_properties_v12.json b/crud-service/appconfig/model/edge_properties_v12.json
new file mode 100644
index 0000000..8d00636
--- /dev/null
+++ b/crud-service/appconfig/model/edge_properties_v12.json
@@ -0,0 +1,6 @@
+{
+        "contains-other-v": "java.lang.String",
+        "delete-other-v": "java.lang.String",
+        "SVC-INFRA": "java.lang.String",
+        "prevent-delete": "java.lang.String"
+}
\ No newline at end of file
diff --git a/crud-service/dynamic/conf/crud-beans.xml b/crud-service/dynamic/conf/crud-beans.xml
new file mode 100644
index 0000000..1945050
--- /dev/null
+++ b/crud-service/dynamic/conf/crud-beans.xml
@@ -0,0 +1,30 @@
+<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="champDao" class="org.onap.crud.dao.champ.ChampDao">
+        <constructor-arg name="champUrl" value="https://localhost:9522/services/champ-service/v1/"/>
+        <constructor-arg name="certPassword" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10"/>
+    </bean>
+    
+    <bean id="graphDataService" class="org.onap.crud.service.CrudGraphDataService">
+        <constructor-arg name="dao" ref="champDao"/>
+        <constructor-arg name="daoForGet" ref="champDao"/>
+    </bean>
+
+    <bean id="crudRestService" class="org.onap.crud.service.CrudRestService" init-method="startup">
+        <constructor-arg name="graphDataService" ref="graphDataService"/>
+    </bean>
+
+    <bean id="aaiResourceService" class="org.onap.crud.service.AaiResourceService"
+        init-method="startup">
+        <constructor-arg name="graphDataService" ref="graphDataService"/>
+    </bean>
+
+</beans>
diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 2c1376b..fd97fe6 100755
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -14,6 +14,7 @@ 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";
+export CRUD_LOGS="/opt/aai/logroot/AAI-CRUD-SERVICE";
 
 if [ ! -d "$RESOURCES_LOGS" ];
 then
@@ -57,6 +58,12 @@ then
     mkdir -p $CHAMP_LOGS;
 fi;
 
+if [ ! -d "$CRUD_LOGS" ];
+then
+    echo "Warning: Unable to find the volume directory $CRUD_LOGS so creating it as regular directory";
+    mkdir -p $CRUD_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}";
@@ -131,6 +138,9 @@ docker tag $DOCKER_REGISTRY/onap/sparky-be:$DOCKER_IMAGE_VERSION $DOCKER_REGISTR
 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;
 
+docker pull ${DOCKER_REGISTRY}/onap/crud-service:${DOCKER_IMAGE_VERSION};
+docker tag $DOCKER_REGISTRY/onap/crud-service:$DOCKER_IMAGE_VERSION $DOCKER_REGISTRY/onap/crud-service:latest;
+
 # cleanup
 $DOCKER_COMPOSE_CMD stop
 $DOCKER_COMPOSE_CMD rm -f -v
@@ -161,6 +171,8 @@ $DOCKER_COMPOSE_CMD up -d model-loader datarouter aai.searchservice.simpledemo.o
 
 $DOCKER_COMPOSE_CMD up -d champ-service
 
+$DOCKER_COMPOSE_CMD up -d crud-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 912309f..b20d06a 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -149,6 +149,30 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
+        
+  crud-service:
+    image: ${DOCKER_REGISTRY}/onap/crud-service
+    hostname: crud-service
+    volumes:
+      - ${CRUD_LOGS}:/logs
+      - /opt/test-config/crud-service/appconfig:/opt/app/crud-service/config
+      - /opt/test-config/crud-service/dynamic:/opt/app/crud-service/dynamic
+    ports:
+      - 9520:9520
+    environment:
+      - CONFIG_HOME=/opt/app/crud-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/crud-service/dynamic/conf
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
 
 networks:
   default:
-- 
2.16.6