From d77be45309a661a787e8d4f485b9823ccc0976e7 Mon Sep 17 00:00:00 2001
From: PatrikBuhr <patrik.buhr@est.tech>
Date: Mon, 21 Sep 2020 14:30:29 +0200
Subject: [PATCH] Added enrichment-coordinator-service module in nonrtric

Change-Id: Ia80132c4891e02a9f88965baabdba22dd00a2aa3
Issue-ID: NONRTRIC-173
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
---
 enrichment-coordinator-service/Dockerfile          | 42 ++++++++++++++++++++++
 .../config/application.yaml                        |  6 ++--
 enrichment-coordinator-service/pom.xml             | 22 +-----------
 pom.xml                                            |  1 +
 4 files changed, 47 insertions(+), 24 deletions(-)
 create mode 100644 enrichment-coordinator-service/Dockerfile

diff --git a/enrichment-coordinator-service/Dockerfile b/enrichment-coordinator-service/Dockerfile
new file mode 100644
index 00000000..34799024
--- /dev/null
+++ b/enrichment-coordinator-service/Dockerfile
@@ -0,0 +1,42 @@
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2020 Nordix Foundation.
+# ================================================================================
+# 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.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+FROM openjdk:11-jre-slim
+
+ARG JAR
+
+WORKDIR /opt/app/enrichment-coordinator-service
+RUN mkdir -p /var/log/enrichment-coordinator-service
+RUN mkdir -p /opt/app/enrichment-coordinator-service/etc/cert/
+
+EXPOSE 8081 8433
+
+ADD /config/application.yaml /opt/app/enrichment-coordinator-service/config/application.yaml
+ADD target/${JAR} /opt/app/enrichment-coordinator-service/enrichment-coordinator-service.jar
+ADD /config/keystore.jks /opt/app/enrichment-coordinator-service/etc/cert/keystore.jks
+ADD /config/truststore.jks /opt/app/enrichment-coordinator-service/etc/cert/truststore.jks
+
+
+RUN chmod -R 777 /opt/app/enrichment-coordinator-service/config/
+
+CMD ["java", "-jar", "/opt/app/enrichment-coordinator-service/enrichment-coordinator-service.jar"]
+
+
+
+
diff --git a/enrichment-coordinator-service/config/application.yaml b/enrichment-coordinator-service/config/application.yaml
index db7d3af2..543e287b 100644
--- a/enrichment-coordinator-service/config/application.yaml
+++ b/enrichment-coordinator-service/config/application.yaml
@@ -18,10 +18,10 @@ logging:
     org.springframework.data: ERROR
     org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
     org.oransc.enrichment: INFO
-  file: /var/log/policy-agent/application.log
+  file: /var/log/enrichment-coordinator-service/application.log
 server:
-   port : 8433
-   http-port: 8081
+   port : 8434
+   http-port: 8082
    ssl:
       key-store-type: JKS
       key-store-password: policy_agent
diff --git a/enrichment-coordinator-service/pom.xml b/enrichment-coordinator-service/pom.xml
index 3f156a7a..a8cffe15 100644
--- a/enrichment-coordinator-service/pom.xml
+++ b/enrichment-coordinator-service/pom.xml
@@ -31,7 +31,7 @@
     </parent>
     <groupId>org.o-ran-sc.nonrtric</groupId>
     <artifactId>enrichment-coordinator-service</artifactId>
-    <version>0.0.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -353,26 +353,6 @@
                 <artifactId>sonar-maven-plugin</artifactId>
                 <version>${sonar-maven-plugin.version}</version>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>run-test-script</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>bash</executable>
-                    <arguments>
-                        <argument>run_test.sh</argument>
-                    </arguments>
-                    <workingDirectory>../test/jenkins/</workingDirectory>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     <issueManagement>
diff --git a/pom.xml b/pom.xml
index f7c5053c..cb8302ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
     <modules>
         <module>policy-agent</module>
         <module>sdnc-a1-controller</module>
+        <module>enrichment-coordinator-service</module>
     </modules>
     <build>
         <plugins>
-- 
2.16.6