SDN-R data-provider with ES7

Extend to ES 7.x and DB setup

Issue-ID: SDNC-1288
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: Id7778322b793bfa7472a14a90bc0d1fd953c8c73
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>

2 files changed, 80 insertions, 30 deletions

diff --git a/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestData.java b/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestData.java
index c7864560b..ab0510c9c 100644
--- a/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestData.java
+++ b/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestData.java
@@ -48,32 +48,79 @@ import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.Release;
  *
  */
 public class TestData {
-    private static final JSONObject EVENTLOG_SEARCHHIT = new JSONObject("{\n" + "\"_index\": \"sdnevents_v1\",\n"
-            + "\"_type\": \"eventlog\",\n" + "\"_id\": \"AXB7cJHlZ_FApnwi29xq\",\n" + "\"_version\": 1,\n"
-            + "\"_score\": 1,\n" + "\"_source\": {\n" + "\"event\": {\n"
-            + "\"nodeName\": \"SDN-Controller-465e2ae306ca\",\n" + "\"counter\": \"1\",\n"
-            + "\"timeStamp\": \"2020-02-25T08:22:19.8Z\",\n" + "\"objectId\": \"sim2230\",\n"
-            + "\"attributeName\": \"ConnectionStatus\",\n" + "\"newValue\": \"connecting\",\n"
-            + "\"type\": \"AttributeValueChangedNotificationXml\"\n" + "}\n" + "}\n" + "}");
-    private static final JSONObject EVENTLOG_SEARCHHIT2 = new JSONObject("{\n" + "\"_index\": \"sdnevents_v1\",\n"
-            + "\"_type\": \"eventlog\",\n" + "\"_id\": \"AXB7cJHlZ_FApnwi29xq\",\n" + "\"_version\": 1,\n"
-            + "\"_score\": 1,\n" + "\"_source\": {\n" + "\"event\": {\n"
-            + "\"nodeName\": \"SDN-Controller-465e2ae306ca\",\n" + "\"counter\": \"3\",\n"
-            + "\"timeStamp\": \"2020-02-22T08:22:19.8Z\",\n" + "\"objectId\": \"sim2230\",\n"
-            + "\"attributeName\": \"ConnectionStatus\",\n" + "\"newValue\": \"connected\",\n"
-            + "\"type\": \"AttributeValueChangedNotificationXml\"\n" + "}\n" + "}\n" + "}");
-    private static final String CONFIG_CONTENT = "[dcae]\n" + "dcaeUserCredentials=admin:admin\n" + "dcaeUrl=off\n"
-            + "dcaeHeartbeatPeriodSeconds=120\n" + "dcaeTestCollector=no\n" + "\n" + "[es]\n"
-            + "esCluster=sendateodl5\n" + "#time limit to keep increasing data in database [in seconds]\n"
-            + "#60*60*24*30 (30days)\n" + "esArchiveLimit=2592000\n" + "#folder where removed data will be stored\n"
-            + "esArchiveFolder=./backup\n" + "#interval to archive database [in seconds]\n" + "#60*60*24 (1day)\n"
-            + "esArchiveInterval=86400\n" + "\n" + "[aai]\n" + "#keep comment\n"
-            + "aaiHeaders=[\"X-TransactionId: 9999\"]\n" + "aaiUrl=http://localhost:81\n"
-            + "aaiUserCredentials=AAI:AAI\n" + "aaiDeleteOnMountpointRemove=false\n" + "aaiTrustAllCerts=false\n"
-            + "aaiApiVersion=aai/v13\n" + "aaiPropertiesFile=aaiclient.properties\n" + "aaiApplicationId=SDNR\n"
+    // @formatter:off 
+    private static final JSONObject EVENTLOG_SEARCHHIT = new JSONObject("{\n"
+            + "\"_index\": \"sdnevents_v1\",\n"
+            + "\"_type\": \"eventlog\",\n"
+            + "\"_id\": \"AXB7cJHlZ_FApnwi29xq\",\n"
+            + "\"_version\": 1,\n"
+            + "\"_score\": 1,\n"
+            + "\"_source\": {\n"
+            + "\"event\": {\n"
+            + "\"nodeName\": \"SDN-Controller-465e2ae306ca\",\n"
+            + "\"counter\": \"1\",\n"
+            + "\"timeStamp\": \"2020-02-25T08:22:19.8Z\",\n"
+            + "\"objectId\": \"sim2230\",\n"
+            + "\"attributeName\": \"ConnectionStatus\",\n"
+            + "\"newValue\": \"connecting\",\n"
+            + "\"type\": \"AttributeValueChangedNotificationXml\"\n"
+            + "}\n"
+            + "}\n"
+            + "}");
+    private static final JSONObject EVENTLOG_SEARCHHIT2 = new JSONObject("{\n"
+            + "\"_index\": \"sdnevents_v1\",\n"
+            + "\"_type\": \"eventlog\",\n"
+            + "\"_id\": \"AXB7cJHlZ_FApnwi29xq\",\n"
+            + "\"_version\": 1,\n"
+            + "\"_score\": 1,\n"
+            + "\"_source\": {\n"
+            + "\"event\": {\n"
+            + "\"nodeName\": \"SDN-Controller-465e2ae306ca\",\n"
+            + "\"counter\": \"3\",\n"
+            + "\"timeStamp\": \"2020-02-22T08:22:19.8Z\",\n"
+            + "\"objectId\": \"sim2230\",\n"
+            + "\"attributeName\": \"ConnectionStatus\",\n"
+            + "\"newValue\": \"connected\",\n"
+            + "\"type\": \"AttributeValueChangedNotificationXml\"\n"
+            + "}\n"
+            + "}\n"
+            + "}");
+    private static final String CONFIG_CONTENT = "[dcae]\n"
+            + "dcaeUserCredentials=admin:admin\n"
+            + "dcaeUrl=off\n"
+            + "dcaeHeartbeatPeriodSeconds=120\n"
+            + "dcaeTestCollector=no\n"
+            + "\n"
+            + "[es]\n"
+            + "esCluster=sendateodl5\n"
+            + "#time limit to keep increasing data in database [in seconds]\n"
+            + "#60*60*24*30 (30days)\n"
+            + "esArchiveLimit=2592000\n"
+            + "#folder where removed data will be stored\n"
+            + "esArchiveFolder=./backup\n"
+            + "#interval to archive database [in seconds]\n"
+            + "#60*60*24 (1day)\n"
+            + "esArchiveInterval=86400\n"
+            + "\n"
+            + "[aai]\n"
+            + "#keep comment\n"
+            + "aaiHeaders=[\"X-TransactionId: 9999\"]\n"
+            + "aaiUrl=http://localhost:81\n"
+            + "aaiUserCredentials=AAI:AAI\n"
+            + "aaiDeleteOnMountpointRemove=false\n"
+            + "aaiTrustAllCerts=false\n"
+            + "aaiApiVersion=aai/v13\n"
+            + "aaiPropertiesFile=aaiclient.properties\n"
+            + "aaiApplicationId=SDNR\n"
             + "aaiPcks12ClientCertFile=/opt/logs/externals/data/stores/keystore.client.p12\n"
-            + "aaiPcks12ClientCertPassphrase=adminadmin\n" + "aaiClientConnectionTimeout=30000\n" + "\n" + "[pm]\n"
-            + "pmCluster=sendateodl5\n" + "pmEnabled=true\n" + "";
+            + "aaiPcks12ClientCertPassphrase=adminadmin\n"
+            + "aaiClientConnectionTimeout=30000\n"
+            + "\n"
+            + "[pm]\n"
+            + "pmCluster=sendateodl5\n"
+            + "pmEnabled=true\n"
+            + "";
+    // @formatter:on 
 
     @Test
     public void testComponentData() {
diff --git a/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestMigrationProvider.java b/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestMigrationProvider.java
index 02877f0c8..32438410f 100644
--- a/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestMigrationProvider.java
+++ b/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/TestMigrationProvider.java
@@ -27,7 +27,6 @@ import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.DataMigrationProviderImpl;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.DataMigrationReport;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.Release;
 
@@ -42,16 +41,20 @@ public class TestMigrationProvider {
             .valueOf(System.getProperty("databaseport") != null ? System.getProperty("databaseport") : "49200"))};
 
     @Test
-    public void testCreateImport() {
+    public void testCreateImport() throws Exception {
         DataMigrationProviderImpl provider = new DataMigrationProviderImpl(hosts, null, null, true, 5000);
 
         try {
+
+
             //create el alto db infrastructure
-            provider.initDatabase(Release.FRANKFURT_R1, 5, 1, "", true, 10000);
+            if (!provider.initDatabase(null, 5, 1, "", true, 10000)) {
+                fail("unable to init database");
+            }
             //import data into database
-            DataMigrationReport report = provider.importData(FRANKFURT_BACKUP_FILE, false, Release.FRANKFURT_R1);
+            DataMigrationReport report = provider.importData(FRANKFURT_BACKUP_FILE, false, Release.FRANKFURT_R2);
             assertTrue(report.completed());
-            assertEquals(Release.FRANKFURT_R1, provider.autoDetectRelease());
+            assertEquals(Release.FRANKFURT_R2, provider.autoDetectRelease());
         } catch (Exception e) {
             fail(e.getMessage());
         }