Merge "NONRTRIC - ECS Persistent storage of EI Jobs"

diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJobs.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJobs.java
index 0380a71..7ca7261 100644 (file)
--- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJobs.java
+++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJobs.java
@@ -178,7 +178,7 @@ public class EiJobs {
     }
 
     private String getDatabaseDirectory() {
-        return config.getVardataDirectory() + "/eijobs";
+        return config.getVardataDirectory() + "/database/eijobs";
     }
 
 }

diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiTypes.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiTypes.java
index 7f04099..6a1b8a1 100644 (file)
--- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiTypes.java
+++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiTypes.java
@@ -143,6 +143,6 @@ public class EiTypes {
     }
 
     private String getDatabaseDirectory() {
-        return config.getVardataDirectory() + "/eitypes";
+        return config.getVardataDirectory() + "/database/eitypes";
     }
 }