Merge "fix waitforyellow in dbclient"

4 files changed, 495 insertions, 386 deletions

diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java
index 10fc5866b..a336c0f6f 100644
--- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java
+++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java
@@ -34,6 +34,7 @@ import java.util.Set;
 
 import org.json.JSONObject;
 import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.Portstatus;
 import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
 import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
 import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
@@ -61,324 +62,363 @@ import org.slf4j.LoggerFactory;
 
 public class DataMigrationProviderImpl implements DataMigrationProviderService {
 
-	private final Logger LOG = LoggerFactory.getLogger(DataMigrationProviderImpl.class);
-
-	private final HtDatabaseClient dbClient;
 	
-	public DataMigrationProviderImpl(HostInfo[] hosts, String username, String password, boolean trustAll) {
-		this.dbClient = new HtDatabaseClient(hosts, username, password, trustAll);
-	}
+    private static final Logger LOG = LoggerFactory.getLogger(DataMigrationProviderImpl.class);
+    private final HtDatabaseClient dbClient;
 
-	@Override
-	public DataMigrationReport importData(String filename, boolean dryrun) throws Exception {
-		return this.importData(filename, dryrun, Release.CURRENT_RELEASE);
-	}
+    public DataMigrationProviderImpl(HostInfo[] hosts, String username, String password, boolean trustAll, long timeoutms) {
 
-	public DataMigrationReport importData(String filename, boolean dryrun, Release forRelease) throws Exception {
-		DataMigrationReport report = new DataMigrationReport();
-		File file = new File(filename);
-		if (!file.exists()) {
-			if (dryrun) {
-				report.error("file %s not found", filename);
-				return report;
-			}
-			throw new FileNotFoundException(filename);
-		}
-		DataContainer container = null;
-		try {
-			container = DataContainer.load(file);
-		} catch (Exception e) {
-			if (dryrun) {
-				report.error("problem loading file %s: %s", filename, e.getMessage());
-				return report;
-			}
-			throw new Exception("problem loading file " + filename, e);
-		}
-		ReleaseInformation ri = ReleaseInformation.getInstance(forRelease);
-		SearchHitConverter converter;
-		Set<ComponentName> components = ri.getComponents();
-		//for all db components of dest architecture
-		for (ComponentName component : components) {
-			//convert to ComponentData for current release with existing ComponentData of the container
-			converter = SearchHitConverter.Factory.getInstance(container.getRelease(), forRelease, component);
-			if (converter == null) {
-				continue;
-			}
-			ComponentData data = converter.convert(container);
-			if (data != null) {
-				String indexName = ri.getAlias(component);
-				String dataTypeName = ri.getDataType(component);
-				if (dryrun) {
-					report.log("write %d entries into %s/%s", data.size(), indexName, dataTypeName);
-				} else {
-					LOG.debug("write {} entries into {}/{}", data.size(), indexName, dataTypeName);
-				}
-				for (SearchHit item : data) {
-					if (!dryrun) {
-						String id = this.dbClient.doWriteRaw(indexName, dataTypeName, item.getId(),
-								item.getSourceAsString());
-						if (!item.getId().equals(id)) {
-							LOG.warn("entry for {} with original id {} was written with another id {}",
-									component.getValue(), item.getId(), id);
-						}
-					}
-				}
-			} else {
-				if (dryrun) {
-					report.error("unable to convert data for " + component.getValue() + " from version "
-							+ container.getRelease().getValue() + " to " + forRelease.getValue() + "\n");
-				} else {
-					LOG.warn("unable to convert data for {} from version {} to {}", component.getValue(),
-							container.getRelease().getValue(), forRelease.getValue());
-				}
-			}
-		}
-		LOG.info("import of {} completed", filename);
-		if (dryrun) {
-			report.log("import of %s completed", filename);
-		}
-		report.setCompleted(true);
-		return report;
-	}
+        if(timeoutms>0) {
+            Portstatus.waitSecondsTillAvailable(timeoutms/1000, hosts);
+        }
+        this.dbClient = new HtDatabaseClient(hosts, username, password, trustAll);
+    }
 
-	
-	/**
-	 * export data
-	 * if file exists .1 (.n) will be created
-	 * 
-	 */
-	@Override
-	public DataMigrationReport exportData(String filename) {
-		DataMigrationReport report = new DataMigrationReport();
+    @Override
+    public DataMigrationReport importData(String filename, boolean dryrun) throws Exception {
+        return this.importData(filename, dryrun, Release.CURRENT_RELEASE);
+    }
 
-		DataContainer container = new DataContainer();
+    public DataMigrationReport importData(String filename, boolean dryrun, Release forRelease) throws Exception {
+        DataMigrationReport report = new DataMigrationReport();
+        File file = new File(filename);
+        if (!file.exists()) {
+            if (dryrun) {
+                report.error("file %s not found", filename);
+                return report;
+            }
+            throw new FileNotFoundException(filename);
+        }
+        DataContainer container = null;
+        try {
+            container = DataContainer.load(file);
+        } catch (Exception e) {
+            if (dryrun) {
+                report.error("problem loading file %s: %s", filename, e.getMessage());
+                return report;
+            }
+            throw new Exception("problem loading file " + filename, e);
+        }
+        ReleaseInformation ri = ReleaseInformation.getInstance(forRelease);
+        SearchHitConverter converter;
+        Set<ComponentName> components = ri.getComponents();
+        //for all db components of dest architecture
+        for (ComponentName component : components) {
+            //convert to ComponentData for current release with existing ComponentData of the container
+            converter = SearchHitConverter.Factory.getInstance(container.getRelease(), forRelease, component);
+            if (converter == null) {
+                continue;
+            }
+            ComponentData data = converter.convert(container);
+            if (data != null) {
+                String indexName = ri.getAlias(component);
+                String dataTypeName = ri.getDataType(component);
+                if (dryrun) {
+                    report.log("write %d entries into %s/%s", data.size(), indexName, dataTypeName);
+                } else {
+                    LOG.debug("write {} entries into {}/{}", data.size(), indexName, dataTypeName);
+                }
+                for (SearchHit item : data) {
+                    if (!dryrun) {
+                        String id = this.dbClient.doWriteRaw(indexName, dataTypeName, item.getId(),
+                                item.getSourceAsString());
+                        if (!item.getId().equals(id)) {
+                            LOG.warn("entry for {} with original id {} was written with another id {}",
+                                    component.getValue(), item.getId(), id);
+                        }
+                    }
+                }
+            } else {
+                if (dryrun) {
+                    report.error("unable to convert data for " + component.getValue() + " from version "
+                            + container.getRelease().getValue() + " to " + forRelease.getValue() + "\n");
+                } else {
+                    LOG.warn("unable to convert data for {} from version {} to {}", component.getValue(),
+                            container.getRelease().getValue(), forRelease.getValue());
+                }
+            }
+        }
+        LOG.info("import of {} completed", filename);
+        if (dryrun) {
+            report.log("import of %s completed", filename);
+        }
+        report.setCompleted(true);
+        return report;
+    }
 
-		filename = this.checkFilenameForWrite(filename);
-		LOG.info("output will be written to {}", filename);
-		//autodetect version
-		Release dbRelease = this.autoDetectRelease();
-		if(dbRelease==null) {
-			report.error("unbable to detect db release. is database initialized?");
-			return report;
-		}
-		ReleaseInformation ri = ReleaseInformation.getInstance(dbRelease);
-		boolean componentsSucceeded = true;
-		for(ComponentName c: ri.getComponents()) {
-			ComponentData data = new ComponentData(c);
-			SearchResult<SearchHit> result = this.dbClient.doReadAllJsonData(ri.getAlias(c),ri.getDataType(c),false);
-			data.addAll(result.getHits());
-			container.addComponent(c, data );
-		}
-		try {
-			Files.write(new File(filename).toPath(), Arrays.asList(container.toJSON()), StandardCharsets.UTF_8);
-			report.setCompleted(componentsSucceeded);
-		} catch (IOException e) {
-			LOG.warn("problem writing data to {}: {}", filename, e);
-		}
-		return report;
-	}
 
-	private String checkFilenameForWrite(String filename) {
-		File f = new File(filename);
-		if (!f.exists()) {
-			return filename;
-		}
-		return this.checkFilenameForWrite(filename, 0);
-	}
+    /**
+     * export data
+     * if file exists .1 (.n) will be created
+     *
+     */
+    @Override
+    public DataMigrationReport exportData(String filename) {
+        DataMigrationReport report = new DataMigrationReport();
 
-	private String checkFilenameForWrite(String filename, int apdx) {
-		File f = new File(String.format("$s.$d",filename,apdx));
-		if (!f.exists()) {
-			return filename;
-		}
-		return this.checkFilenameForWrite(filename, apdx + 1);
-	}
+        DataContainer container = new DataContainer();
 
-	@Override
-	public Release getCurrentVersion() {
-		return Release.CURRENT_RELEASE;
-	}
+        filename = this.checkFilenameForWrite(filename);
+        LOG.info("output will be written to {}", filename);
+        //autodetect version
+        Release dbRelease = this.autoDetectRelease();
+        if(dbRelease==null) {
+            report.error("unbable to detect db release. is database initialized?");
+            return report;
+        }
+        ReleaseInformation ri = ReleaseInformation.getInstance(dbRelease);
+        boolean componentsSucceeded = true;
+        for(ComponentName c: ri.getComponents()) {
+            ComponentData data = new ComponentData(c);
+            SearchResult<SearchHit> result = this.dbClient.doReadAllJsonData(ri.getAlias(c),ri.getDataType(c),false);
+            data.addAll(result.getHits());
+            container.addComponent(c, data );
+        }
+        try {
+            Files.write(new File(filename).toPath(), Arrays.asList(container.toJSON()), StandardCharsets.UTF_8);
+            report.setCompleted(componentsSucceeded);
+        } catch (IOException e) {
+            LOG.warn("problem writing data to {}: {}", filename, e);
+        }
+        return report;
+    }
 
+    private String checkFilenameForWrite(String filename) {
+        File f = new File(filename);
+        if (!f.exists()) {
+            return filename;
+        }
+        return this.checkFilenameForWrite(filename, 0);
+    }
 
-	public Release autoDetectRelease() {
-		EsVersion dbVersion = this.readActualVersion();
-		AliasesEntryList aliases = this.readAliases();
-		IndicesEntryList indices = this.readIndices();
-		if(indices==null) {
-			return null;
-		}
-		List<Release> foundReleases = new ArrayList<Release>();
-		//if there are active aliases reduce indices to the active ones
-		if(aliases!=null && aliases.size()>0) {
-			indices = indices.subList(aliases.getLinkedIndices());
-		}
-		for(Release r:Release.values()) {
-			if(r.isDbInRange(dbVersion)) {
-				ReleaseInformation ri = ReleaseInformation.getInstance(r);
-				if(ri!=null && ri.containsIndices(indices)) {
-					foundReleases.add(r);
-				}
-			}
-		}
-		if (foundReleases.size() == 1) {
-			return foundReleases.get(0);
-		}
-		LOG.error("detect {} releases: {}. unable to detect for which one to do sth.",foundReleases.size(), foundReleases);
-		return null;
-	}
-	private EsVersion readActualVersion() {
-		try {
-			GetInfoResponse response = this.dbClient.getInfo();
-			return response.getVersion();
-		} catch (Exception e) {
-			LOG.warn(e.getMessage());
-		}
-		return null;
-	}
+    private String checkFilenameForWrite(String filename, int apdx) {
+        File f = new File(String.format("$s.$d",filename,apdx));
+        if (!f.exists()) {
+            return filename;
+        }
+        return this.checkFilenameForWrite(filename, apdx + 1);
+    }
 
-	private AliasesEntryList readAliases() {
-		AliasesEntryList entries = null;
-		try {
-			ListAliasesResponse response = this.dbClient.getAliases();
-			entries = response.getEntries();
-		} catch (ParseException | IOException e) {
-			LOG.error(e.getMessage());
-		}
-		return entries;
-	}
+    @Override
+    public Release getCurrentVersion() {
+        return Release.CURRENT_RELEASE;
+    }
 
-	private IndicesEntryList readIndices() {
-		IndicesEntryList entries = null;
-		try {
-			ListIndicesResponse response = this.dbClient.getIndices();
-			entries = response.getEntries();
-		} catch (ParseException | IOException e) {
-			LOG.error(e.getMessage());
-		}
-		return entries;
-	}
 
-	@Override
-	public boolean initDatabase(Release release, int numShards, int numReplicas, String dbPrefix,
-			boolean forceRecreate,long timeoutms) {
+    public Release autoDetectRelease() {
+        EsVersion dbVersion = this.readActualVersion();
+        AliasesEntryList aliases = this.readAliases();
+        IndicesEntryList indices = this.readIndices();
+        if(indices==null) {
+            return null;
+        }
+        List<Release> foundReleases = new ArrayList<>();
+        //if there are active aliases reduce indices to the active ones
+        if(aliases!=null && aliases.size()>0) {
+            indices = indices.subList(aliases.getLinkedIndices());
+        }
+        for(Release r:Release.values()) {
+            if(r.isDbInRange(dbVersion)) {
+                ReleaseInformation ri = ReleaseInformation.getInstance(r);
+                if(ri!=null && ri.containsIndices(indices)) {
+                    foundReleases.add(r);
+                }
+            }
+        }
+        if (foundReleases.size() == 1) {
+            return foundReleases.get(0);
+        }
+        LOG.error("detect {} releases: {}. unable to detect for which one to do sth.",foundReleases.size(), foundReleases);
+        return null;
+    }
+    private EsVersion readActualVersion() {
+        try {
+            GetInfoResponse response = this.dbClient.getInfo();
+            return response.getVersion();
+        } catch (Exception e) {
+            LOG.warn(e.getMessage());
+        }
+        return null;
+    }
+
+    private AliasesEntryList readAliases() {
+        AliasesEntryList entries = null;
+        try {
+            ListAliasesResponse response = this.dbClient.getAliases();
+            entries = response.getEntries();
+        } catch (ParseException | IOException e) {
+            LOG.error(e.getMessage());
+        }
+        return entries;
+    }
+
+    private IndicesEntryList readIndices() {
+        IndicesEntryList entries = null;
+        try {
+            ListIndicesResponse response = this.dbClient.getIndices();
+            entries = response.getEntries();
+        } catch (ParseException | IOException e) {
+            LOG.error(e.getMessage());
+        }
+        return entries;
+    }
+
+    @Override
+    public boolean initDatabase(Release release, int numShards, int numReplicas, String dbPrefix,
+            boolean forceRecreate,long timeoutms) {
+        if(timeoutms>0) {
+            this.dbClient.waitForYellowStatus(timeoutms);
+        }
+        EsVersion dbVersion = this.readActualVersion();
+        if (dbVersion == null) {
+            return false;
+        }
+        if (!release.isDbInRange(dbVersion)) {
+            LOG.warn("db version {} maybe not compatible with release {}", dbVersion, release);
+            return false;
+        }
+        if (forceRecreate) {
+            this.clearDatabase(release, dbPrefix,0);
+        }
+        ReleaseInformation ri = ReleaseInformation.getInstance(release);
+        AliasesEntryList aliases = this.readAliases();
+        IndicesEntryList indices = this.readIndices();
+        if (aliases == null || indices == null) {
+            return false;
+        }
+        AcknowledgedResponse response = null;
+        if(!ri.runPreInitCommands(this.dbClient)) {
+            return false;
+        }
+        for (ComponentName component : ri.getComponents()) {
+            try {
+                if (ri.hasOwnDbIndex(component)) {
+                    //check if index already exists
+                    String indexName = ri.getIndex(component, dbPrefix);
+                    String aliasName = ri.getAlias(component, dbPrefix);
+                    if (indices.findByIndex(indexName) == null) {
+                        LOG.info("creating index for {}", component);
+                        CreateIndexRequest request = new CreateIndexRequest(ri.getIndex(component, dbPrefix));
+                        request.mappings(new JSONObject(ri.getDatabaseMapping(component)));
+                        request.settings(new JSONObject(ri.getDatabaseSettings(component, numShards, numReplicas)));
+                        response = this.dbClient.createIndex(request);
+                        LOG.info(response.isAcknowledged() ? "succeeded" : "failed");
+                    } else {
+                        LOG.info("index {} for {} already exists", indexName, component);
+                    }
+                    //check if alias already exists
+                    if (aliases.findByAlias(aliasName) == null) {
+                        LOG.info("creating alias for {}", component);
+                        response = this.dbClient.createAlias(new CreateAliasRequest(indexName, aliasName));
+                        LOG.info(response.isAcknowledged() ? "succeeded" : "failed");
+                    } else {
+                        LOG.info("alias {} for index {} for {} already exists", aliasName, indexName, component);
+                    }
+                }
+            } catch (IOException e) {
+                LOG.error(e.getMessage());
+                return false;
+            }
+        }
+        if(!ri.runPostInitCommands(this.dbClient)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean clearDatabase(Release release, String dbPrefix, long timeoutms) {
+
+        if(timeoutms>0) {
+            this.dbClient.waitForYellowStatus(timeoutms);
+        }
+        //check aliases
+        AliasesEntryList entries = this.readAliases();
+        if (entries == null) {
+            return false;
+        }
+        ReleaseInformation ri = ReleaseInformation.getInstance(release);
+        AcknowledgedResponse response;
+        if (entries.size() <= 0) {
+            LOG.info("no aliases to clear");
+        } else {
+            //check for every component of release if alias exists
+            for (ComponentName component : ri.getComponents()) {
+                String aliasToDelete = ri.getAlias(component, dbPrefix);
+                AliasesEntry entryToDelete = entries.findByAlias(aliasToDelete);
+                if (entryToDelete != null) {
+                    try {
+                        LOG.info("deleting alias {} for index {}", entryToDelete.getAlias(), entryToDelete.getIndex());
+                        response=this.dbClient.deleteAlias(
+                                new DeleteAliasRequest(entryToDelete.getIndex(), entryToDelete.getAlias()));
+                        LOG.info(response.isResponseSucceeded()?"succeeded":"failed");
+                    } catch (IOException e) {
+                        LOG.error(e.getMessage());
+                        return false;
+                    }
+                }
+            }
+        }
+        IndicesEntryList entries2 = this.readIndices();
+        if (entries2 == null) {
+            return false;
+        }
+        if (entries2.size() <= 0) {
+            LOG.info("no indices to clear");
+        } else {
+            //check for every component of release if index exists
+            for (ComponentName component : ri.getComponents()) {
+                String indexToDelete = ri.getIndex(component, dbPrefix);
+                IndicesEntry entryToDelete = entries2.findByIndex(indexToDelete);
+                if (entryToDelete != null) {
+                    try {
+                        LOG.info("deleting index {}", entryToDelete.getName());
+                        response=this.dbClient.deleteIndex(new DeleteIndexRequest(entryToDelete.getName()));
+                        LOG.info(response.isResponseSucceeded()?"succeeded":"failed");
+                    } catch (IOException e) {
+                        LOG.error(e.getMessage());
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+	/**
+	 * @param timeoutms
+	 * @return
+	 */
+	public boolean clearCompleteDatabase(long timeoutms) {
 		if(timeoutms>0) {
-			this.dbClient.waitForYellowStatus(timeoutms);
-		}
-		EsVersion dbVersion = this.readActualVersion();
-		if (dbVersion == null) {
-			return false;
-		}
-		if (!release.isDbInRange(dbVersion)) {
-			LOG.warn("db version {} maybe not compatible with release {}", dbVersion, release);
-			return false;
-		}
-		if (forceRecreate) {
-			this.clearDatabase(release, dbPrefix,0);
-		}
-		ReleaseInformation ri = ReleaseInformation.getInstance(release);
+            this.dbClient.waitForYellowStatus(timeoutms);
+        }
+        //check aliases and indices
 		AliasesEntryList aliases = this.readAliases();
-		IndicesEntryList indices = this.readIndices();
-		if (aliases == null || indices == null) {
-			return false;
-		}
-		AcknowledgedResponse response = null;
-		if(!ri.runPreInitCommands(this.dbClient)) {
-			return false;
-		}
-		for (ComponentName component : ri.getComponents()) {
-			try {
-				if (ri.hasOwnDbIndex(component)) {
-					//check if index already exists
-					String indexName = ri.getIndex(component, dbPrefix);
-					String aliasName = ri.getAlias(component, dbPrefix);
-					if (indices.findByIndex(indexName) == null) {
-						LOG.info("creating index for {}", component);
-						CreateIndexRequest request = new CreateIndexRequest(ri.getIndex(component, dbPrefix));
-						request.mappings(new JSONObject(ri.getDatabaseMapping(component)));
-						request.settings(new JSONObject(ri.getDatabaseSettings(component, numShards, numReplicas)));
-						response = this.dbClient.createIndex(request);
-						LOG.info(response.isAcknowledged() ? "succeeded" : "failed");
-					} else {
-						LOG.info("index {} for {} already exists", indexName, component);
-					}
-					//check if alias already exists
-					if (aliases.findByAlias(aliasName) == null) {
-						LOG.info("creating alias for {}", component);
-						response = this.dbClient.createAlias(new CreateAliasRequest(indexName, aliasName));
-						LOG.info(response.isAcknowledged() ? "succeeded" : "failed");
-					} else {
-						LOG.info("alias {} for index {} for {} already exists", aliasName, indexName, component);
-					}
-				}
+        IndicesEntryList indices = this.readIndices();
+        if (aliases == null || indices == null) {
+            return false;
+        }
+        for(AliasesEntry alias:aliases) {
+        	try {
+        		LOG.info("deleting alias {} for index {}",alias.getAlias(),alias.getIndex());
+				this.dbClient.deleteAlias(new DeleteAliasRequest(alias.getIndex(), alias.getAlias()));
 			} catch (IOException e) {
-				LOG.error(e.getMessage());
+				LOG.error("problem deleting alias {}: {}",alias.getAlias(),e);
 				return false;
 			}
-		}
-		if(!ri.runPostInitCommands(this.dbClient)) {
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public boolean clearDatabase(Release release, String dbPrefix, long timeoutms) {
-
-		if(timeoutms>0) {
-			this.dbClient.waitForYellowStatus(timeoutms);
-		}
-		//check aliases
-		AliasesEntryList entries = this.readAliases();
-		if (entries == null) {
-			return false;
-		}
-		ReleaseInformation ri = ReleaseInformation.getInstance(release);
-		AcknowledgedResponse response;
-		if (entries.size() <= 0) {
-			LOG.info("no aliases to clear");
-		} else {
-			//check for every component of release if alias exists
-			for (ComponentName component : ri.getComponents()) {
-				String aliasToDelete = ri.getAlias(component, dbPrefix);
-				AliasesEntry entryToDelete = entries.findByAlias(aliasToDelete);
-				if (entryToDelete != null) {
-					try {
-						LOG.info("deleting alias {} for index {}", entryToDelete.getAlias(), entryToDelete.getIndex());
-						response=this.dbClient.deleteAlias(
-								new DeleteAliasRequest(entryToDelete.getIndex(), entryToDelete.getAlias()));
-						LOG.info(response.isResponseSucceeded()?"succeeded":"failed");
-					} catch (IOException e) {
-						LOG.error(e.getMessage());
-						return false;
-					}
-				}
-			}
-		}
-		IndicesEntryList entries2 = this.readIndices();
-		if (entries2 == null) {
-			return false;
-		}
-		if (entries2.size() <= 0) {
-			LOG.info("no indices to clear");
-		} else {
-			//check for every component of release if index exists
-			for (ComponentName component : ri.getComponents()) {
-				String indexToDelete = ri.getIndex(component, dbPrefix);
-				IndicesEntry entryToDelete = entries2.findByIndex(indexToDelete);
-				if (entryToDelete != null) {
-					try {
-						LOG.info("deleting index {}", entryToDelete.getName());
-						response=this.dbClient.deleteIndex(new DeleteIndexRequest(entryToDelete.getName()));
-						LOG.info(response.isResponseSucceeded()?"succeeded":"failed");
-					} catch (IOException e) {
-						LOG.error(e.getMessage());
-						return false;
-					}
-				}
+        }
+        for(IndicesEntry index : indices) {
+        	try {
+        		LOG.info("deleting index {}",index.getName());
+				this.dbClient.deleteIndex(new DeleteIndexRequest(index.getName()));
+			} catch (IOException e) {
+				LOG.error("problem deleting index {}: {}",index.getName(),e);
+				return false;
 			}
-		}
-
-		return true;
+        }
+        return true;
 	}
 
 }
diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/Program.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/Program.java
index a1b92e9b3..d06ffe1ee 100644
--- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/Program.java
+++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/Program.java
@@ -43,12 +43,15 @@ import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.Release;
  */
 public class Program {
 
+	// constants
     private static final String CMD_INITDB = "init";
     private static final String CMD_CLEAR_DB = "delete";
+    private static final String CMD_CLEAR_DB_COMPLETE = "clear";
     private static final String CMD_CREATE_PLUGIN_INIT_FILE = "pluginfile";
     private static final String CMD_IMPORT = "import";
     private static final String CMD_EXPORT = "export";
     private static final String CMD_LIST_VERSION = "list";
+
     private static final String CMD_INITDB_DESCRIPTION = "initialize databse indices and aliases";
     private static final String CMD_CLEAR_DB_DESCRIPTION = "clear database indices and aliases";
     private static final String CMD_CREATE_PLUGIN_INIT_FILE_DESCRIPTION = "create maven plugin file";
@@ -76,12 +79,27 @@ public class Program {
     private static final String OPTION_INPUTFILE_SHORT = "if";
     private static final String OPTION_DEBUG_SHORT = "x";
     private static final String OPTION_TRUSTINSECURESSL_SHORT = "k";
-    private static final String OPTION_DATABSE_SHORT = "db";
-
+    private static final String OPTION_DATABASE_SHORT = "db";
+    private static final String OPTION_COMMAND_SHORT = "c";
+	private static final String OPTION_DATABASEUSER_SHORT = "dbu";
+	private static final String OPTION_DATABASEPASSWORD_SHORT = "dbp";
+	private static final String OPTION_DATABASEPREFIX_SHORT = "p";
+	private static final String OPTION_DATABASEWAIT_SHORT = "w";
+	private static final String OPTION_HELP_SHORT = "h";
+    // end of constants
+	
+	// variables
     private static Options options = init();
-
     private static Log LOG = null;
-
+    // end of variables
+    
+    // public methods
+    public static void main(String[] args) {
+        System.exit( main2(args) );
+    }
+    // end of public methods
+    
+    // private methods
     @SuppressWarnings("unchecked")
     private static <T> T getOptionOrDefault(CommandLine cmd, String option, T def) throws ParseException {
         if (def instanceof Boolean) {
@@ -133,20 +151,22 @@ public class Program {
         // repeat with all other desired appenders
     }
 
-    public static void main(String[] args) {
+    private static int main2(String[] args) {
+
         CommandLineParser parser = new DefaultParser();
         HelpFormatter formatter = new HelpFormatter();
         CommandLine cmd = null;
+       
         try {
             cmd = parser.parse(options, args);
         } catch (ParseException e) {
             System.out.println(e.getMessage());
             printHelp(formatter);
-            System.exit(1);
+            return 1;
         }
         if (cmd == null) {
             printHelp(formatter);
-            System.exit(1);
+            return 1;
         }
         try {
             initLog(getOptionOrDefault(cmd, OPTION_SILENT_SHORT, false), null,
@@ -154,54 +174,75 @@ public class Program {
         } catch (ParseException e2) {
 
         }
-        switch (cmd.getOptionValue("c")) {
+        try {
+			if(getOptionOrDefault(cmd, OPTION_HELP_SHORT, false)) {
+			    printHelp(formatter);
+			    return 0;
+			}
+		} catch (ParseException e2) {
+			return exit(e2);
+		}
+        final String command = cmd.getOptionValue(OPTION_COMMAND_SHORT);
+        if(command==null) {
+        	printHelp(formatter);
+            return 1;
+        }
+        switch (command) {
         case CMD_INITDB:
             try {
                 cmd_init_db(cmd);
             } catch (Exception e1) {
-                exit(e1);
+                return exit(e1);
             }
             break;
         case CMD_CLEAR_DB:
             try {
                 cmd_clear_db(cmd);
             } catch (Exception e1) {
-                exit(e1);
+                return exit(e1);
+            }
+            break;
+        case CMD_CLEAR_DB_COMPLETE:
+        	try {
+                cmd_clear_db_complete(cmd);
+            } catch (Exception e1) {
+                return exit(e1);
             }
             break;
         case CMD_CREATE_PLUGIN_INIT_FILE:
             try {
-                String of = getOptionOrDefault(cmd, "of", null);
+                String of = getOptionOrDefault(cmd, OPTION_OUTPUTFILE_SHORT, null);
                 if (of == null) {
                     throw new Exception("please add the parameter output-file");
                 }
                 MavenDatabasePluginInitFile.create(Release.CURRENT_RELEASE, of);
             } catch (Exception e) {
-                exit(e);
+                return exit(e);
             }
             break;
         case CMD_IMPORT:
             try {
                 cmd_dbimport(cmd);
             } catch (Exception e1) {
-                exit(e1);
+                return exit(e1);
             }
             break;
         case CMD_EXPORT:
             try {
                 cmd_dbexport(cmd);
             } catch (Exception e) {
-                exit(e);
+                return exit(e);
             }
             break;
         case CMD_LIST_VERSION:
             cmd_listversion();
             break;
+
         default:
             printHelp(formatter);
-            break;
+            return 1;
         }
-        System.exit(0);
+        return 0;
     }
 
     private static void printHelp(HelpFormatter formatter) {
@@ -226,16 +267,17 @@ public class Program {
     }
 
    private static void cmd_dbimport(CommandLine cmd) throws Exception {
-        String dbUrl = getOptionOrDefault(cmd, OPTION_DATABSE_SHORT, DEFAULT_DBURL);
-        String username = getOptionOrDefault(cmd, "dbu", null);
-        String password = getOptionOrDefault(cmd, "dbp", null);
+        String dbUrl = getOptionOrDefault(cmd, OPTION_DATABASE_SHORT, DEFAULT_DBURL);
+        String username = getOptionOrDefault(cmd, OPTION_DATABASEUSER_SHORT, null);
+        String password = getOptionOrDefault(cmd, OPTION_DATABASEPASSWORD_SHORT, null);
         String filename = getOptionOrDefault(cmd, OPTION_OUTPUTFILE_SHORT, null);
         boolean trustAll = getOptionOrDefault(cmd, OPTION_TRUSTINSECURESSL_SHORT, false);
         if (filename == null) {
             throw new Exception("please add output file parameter");
         }
+        long timeoutms = getOptionOrDefault(cmd, OPTION_DATABASEWAIT_SHORT, 30)*1000;
         DataMigrationProviderImpl service = new DataMigrationProviderImpl(new HostInfo[] { HostInfo.parse(dbUrl) },
-                username, password, trustAll);
+                username, password, trustAll, timeoutms);
         DataMigrationReport report = service.importData(filename, false);
         LOG.info(report);
         if(!report.completed()) {
@@ -244,16 +286,17 @@ public class Program {
     }
 
     private static void cmd_dbexport(CommandLine cmd) throws Exception {
-        String dbUrl = getOptionOrDefault(cmd, "db", DEFAULT_DBURL);
-        String username = getOptionOrDefault(cmd, "dbu", null);
-        String password = getOptionOrDefault(cmd, "dbp", null);
+        String dbUrl = getOptionOrDefault(cmd, OPTION_DATABASE_SHORT, DEFAULT_DBURL);
+        String username = getOptionOrDefault(cmd, OPTION_DATABASEUSER_SHORT, null);
+        String password = getOptionOrDefault(cmd, OPTION_DATABASEPASSWORD_SHORT, null);
         String filename = getOptionOrDefault(cmd, OPTION_OUTPUTFILE_SHORT, null);
         boolean trustAll = getOptionOrDefault(cmd, OPTION_TRUSTINSECURESSL_SHORT, false);
         if (filename == null) {
             throw new Exception("please add output file parameter");
         }
+        long timeoutms = getOptionOrDefault(cmd, OPTION_DATABASEWAIT_SHORT, 30)*1000;
         DataMigrationProviderImpl service = new DataMigrationProviderImpl(new HostInfo[] { HostInfo.parse(dbUrl) },
-                username, password, trustAll);
+                username, password, trustAll, timeoutms);
         DataMigrationReport report = service.exportData(filename);
         LOG.info(report);
         if(!report.completed()) {
@@ -262,42 +305,54 @@ public class Program {
 
     }
 
-    private static void exit(Exception e) {
+    private static int exit(Exception e) {
         if (LOG != null) {
             LOG.error("Error during execution: {}", e);
         } else {
             System.err.println(e);
         }
-        System.exit(1);
+        return 1;
     }
 
     private static void cmd_clear_db(CommandLine cmd) throws Exception {
         Release r = getOptionOrDefault(cmd, OPTION_VERSION_SHORT, Release.CURRENT_RELEASE);
-        String dbUrl = getOptionOrDefault(cmd, OPTION_DATABSE_SHORT, DEFAULT_DBURL);
-        String dbPrefix = getOptionOrDefault(cmd, "p", DEFAULT_DBPREFIX);
-        String username = getOptionOrDefault(cmd, "dbu", null);
-        String password = getOptionOrDefault(cmd, "dbp", null);
+        String dbUrl = getOptionOrDefault(cmd, OPTION_DATABASE_SHORT, DEFAULT_DBURL);
+        String dbPrefix = getOptionOrDefault(cmd, OPTION_DATABASEPREFIX_SHORT, DEFAULT_DBPREFIX);
+        String username = getOptionOrDefault(cmd, OPTION_DATABASEUSER_SHORT, null);
+        String password = getOptionOrDefault(cmd, OPTION_DATABASEPASSWORD_SHORT, null);
         boolean trustAll = getOptionOrDefault(cmd, OPTION_TRUSTINSECURESSL_SHORT, false);
+        long timeoutms = getOptionOrDefault(cmd, OPTION_DATABASEWAIT_SHORT, 30)*1000;
         DataMigrationProviderImpl service = new DataMigrationProviderImpl(new HostInfo[] { HostInfo.parse(dbUrl) },
-                username, password, trustAll);
-        long timeoutms = getOptionOrDefault(cmd, "w", 30)*1000;
+                username, password, trustAll, timeoutms);
         if (!service.clearDatabase(r, dbPrefix,timeoutms)) {
             throw new Exception("failed to init database");
         }
     }
+    private static void cmd_clear_db_complete(CommandLine cmd) throws Exception {
+        String dbUrl = getOptionOrDefault(cmd, OPTION_DATABASE_SHORT, DEFAULT_DBURL);
+        String username = getOptionOrDefault(cmd, OPTION_DATABASEUSER_SHORT, null);
+        String password = getOptionOrDefault(cmd, OPTION_DATABASEPASSWORD_SHORT, null);
+        boolean trustAll = getOptionOrDefault(cmd, OPTION_TRUSTINSECURESSL_SHORT, false);
+        long timeoutms = getOptionOrDefault(cmd, OPTION_DATABASEWAIT_SHORT, 30)*1000;
+        DataMigrationProviderImpl service = new DataMigrationProviderImpl(new HostInfo[] { HostInfo.parse(dbUrl) },
+                username, password, trustAll, timeoutms);
+        if (!service.clearCompleteDatabase(timeoutms)) {
+        	throw new Exception("failed to init database");
+        }
+    }
 
     private static void cmd_init_db(CommandLine cmd) throws Exception {
         Release r = getOptionOrDefault(cmd, OPTION_VERSION_SHORT, Release.CURRENT_RELEASE);
         int numShards = getOptionOrDefault(cmd, OPTION_SHARDS_SHORT, DEFAULT_SHARDS);
         int numReplicas = getOptionOrDefault(cmd, OPTION_REPLICAS_SHORT, DEFAULT_REPLICAS);
-        String dbUrl = getOptionOrDefault(cmd, "db", DEFAULT_DBURL);
-        String dbPrefix = getOptionOrDefault(cmd, "p", DEFAULT_DBPREFIX);
-        String username = getOptionOrDefault(cmd, "dbu", null);
-        String password = getOptionOrDefault(cmd, "dbp", null);
+        String dbUrl = getOptionOrDefault(cmd, OPTION_DATABASE_SHORT, DEFAULT_DBURL);
+        String dbPrefix = getOptionOrDefault(cmd, OPTION_DATABASEPREFIX_SHORT, DEFAULT_DBPREFIX);
+        String username = getOptionOrDefault(cmd, OPTION_DATABASEUSER_SHORT, null);
+        String password = getOptionOrDefault(cmd,OPTION_DATABASEPASSWORD_SHORT, null);
         boolean trustAll = getOptionOrDefault(cmd, OPTION_TRUSTINSECURESSL_SHORT, false);
+        long timeoutms = getOptionOrDefault(cmd, OPTION_DATABASEWAIT_SHORT, 30)*1000;
         DataMigrationProviderImpl service = new DataMigrationProviderImpl(new HostInfo[] { HostInfo.parse(dbUrl) },
-                username, password, trustAll);
-        long timeoutms = getOptionOrDefault(cmd, "w", 30)*1000;
+                username, password, trustAll, timeoutms);
         boolean forceRecreate = cmd.hasOption(OPTION_FORCE_RECREATE_SHORT);
         if (!service.initDatabase(r, numShards, numReplicas, dbPrefix, forceRecreate,timeoutms)) {
             throw new Exception("failed to init database");
@@ -307,24 +362,24 @@ public class Program {
 
     private static Options init() {
         Options result = new Options();
-        result.addOption(createOption("c", "cmd", true, "command to execute", true));
-        result.addOption(createOption(OPTION_DATABSE_SHORT, "dburl", true, "database url", false));
-        result.addOption(createOption("dbu", "db-username", true, "database basic auth username", false));
-        result.addOption(createOption("dbp", "db-password", true, "database basic auth password", false));
+        result.addOption(createOption(OPTION_COMMAND_SHORT, "cmd", true, "command to execute", false));
+        result.addOption(createOption(OPTION_DATABASE_SHORT, "dburl", true, "database url", false));
+        result.addOption(createOption(OPTION_DATABASEUSER_SHORT, "db-username", true, "database basic auth username", false));
+        result.addOption(createOption(OPTION_DATABASEPASSWORD_SHORT, "db-password", true, "database basic auth password", false));
         result.addOption(createOption(OPTION_REPLICAS_SHORT, "replicas", true, "amount of replicas", false));
         result.addOption(createOption(OPTION_SHARDS_SHORT, "shards", true, "amount of shards", false));
-        result.addOption(createOption("p", "prefix", true, "prefix for db indices", false));
+        result.addOption(createOption(OPTION_DATABASEPREFIX_SHORT, "prefix", true, "prefix for db indices", false));
         result.addOption(createOption(OPTION_VERSION_SHORT, "version", true, "version", false));
         result.addOption(createOption(OPTION_DEBUG_SHORT, "verbose", false, "verbose mode", false));
         result.addOption(createOption(OPTION_TRUSTINSECURESSL_SHORT, "trust-insecure", false,
                 "trust insecure ssl certs", false));
-        result.addOption(createOption("w", "wait", true, "wait for yellow status with timeout in seconds", false));
+        result.addOption(createOption(OPTION_DATABASEWAIT_SHORT, "wait", true, "wait for yellow status with timeout in seconds", false));
         result.addOption(
                 createOption(OPTION_FORCE_RECREATE_SHORT, "force-recreate", false, "delete if sth exists", false));
         result.addOption(createOption(OPTION_SILENT_SHORT, OPTION_SILENT, false, "prevent console output", false));
         result.addOption(createOption(OPTION_OUTPUTFILE_SHORT, "output-file", true, "file to write into", false));
         result.addOption(createOption(OPTION_INPUTFILE_SHORT, "input-file", true, "file to read from", false));
-
+        result.addOption(createOption(OPTION_HELP_SHORT,"help",false,"show help",false));
         return result;
     }
 
@@ -342,4 +397,5 @@ public class Program {
         o.setRequired(required);
         return o;
     }
+    // end of private methods
 }
diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/ReleaseInformation.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/ReleaseInformation.java
index f45d5e7d5..ccae07c0e 100644
--- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/ReleaseInformation.java
+++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/ReleaseInformation.java
@@ -37,13 +37,17 @@ import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.guilin.GuilinReleaseIn
 
 public abstract class ReleaseInformation {
 
+	// variables
 	private final Release release;
 	private final Map<ComponentName, DatabaseInfo> dbMap;
+	// end of variables
 
+	// constructors
 	public ReleaseInformation(Release r, Map<ComponentName, DatabaseInfo> dbMap) {
 		this.release = r;
 		this.dbMap = dbMap;
 	}
+	// end of constructors
 
 	/**
 	 * get database alias for component
@@ -51,28 +55,37 @@ public abstract class ReleaseInformation {
 	 * @return alias or null if not exists
 	 */
 	public String getAlias(ComponentName name) {
-		return this.getAlias(name,"");
+		return this.getAlias(name, "");
 	}
-	public String getAlias(ComponentName name,String prefix) {
-		return dbMap.get(name) == null ? null : prefix+dbMap.get(name).alias;
+
+	public String getAlias(ComponentName name, String prefix) {
+		return dbMap.get(name) == null ? null : prefix + dbMap.get(name).alias;
 	}
 
 	/**
-	 * @param c
-	 * @return
+	 * get index name for component
+	 * @param comp
+	 * @return null if component does not exists in this release, otherwise index name
 	 */
-	public String getIndex(ComponentName name) {
-		return this.getIndex(name,"");
+	public String getIndex(ComponentName comp) {
+		return this.getIndex(comp, "");
 	}
-	public String getIndex(ComponentName name,String prefix) {
-		return dbMap.get(name) == null ? null : (prefix+dbMap.get(name).getIndex(this.release.getDBSuffix())); 
+
+	/**
+	 * get index name for component with prefix 
+	 * @param comp
+	 * @param prefix
+	 * @return null if component does not exists in this release, otherwise index name
+	 */
+	public String getIndex(ComponentName comp, String prefix) {
+		return dbMap.get(comp) == null ? null : (prefix + dbMap.get(comp).getIndex(this.release.getDBSuffix()));
 	}
 
 	/**
-		 * get database datatype (doctype) for component
-		 * @param name
-		 * @return datatype or null if not exists
-		 */
+	 * get database datatype (doctype) for component
+	 * @param name
+	 * @return datatype or null if not exists
+	 */
 	public String getDataType(ComponentName name) {
 		return dbMap.get(name) == null ? null : dbMap.get(name).doctype;
 	}
@@ -80,20 +93,22 @@ public abstract class ReleaseInformation {
 	public String getDatabaseMapping(ComponentName name) {
 		return dbMap.get(name) == null ? null : dbMap.get(name).getMapping();
 	}
-		/**
+
+	/**
 	 * get database doctype definition for component
 	 * @param name
 	 * @return mappings or null if not exists
 	 */
-	public String getDatabaseMapping(ComponentName name,boolean useStrict) {
+	public String getDatabaseMapping(ComponentName name, boolean useStrict) {
 		return dbMap.get(name) == null ? null : dbMap.get(name).getMapping(useStrict);
 	}
+
 	/**
 	 * get database settings definition for component
 	 * @param name
 	 * @return settings or null if not exists
 	 */
-	public String getDatabaseSettings(ComponentName name,int shards,int replicas) {
+	public String getDatabaseSettings(ComponentName name, int shards, int replicas) {
 		return dbMap.get(name) == null ? null : dbMap.get(name).getSettings(shards, replicas);
 	}
 
@@ -104,7 +119,7 @@ public abstract class ReleaseInformation {
 	 * @return
 	 */
 	public SearchHitConverter getConverter(Release dst, ComponentName comp) {
-		if(dst==this.release && this.getComponents().contains(comp)) {
+		if (dst == this.release && this.getComponents().contains(comp)) {
 			return new KeepDataSearchHitConverter(comp);
 		}
 		return null;
@@ -135,7 +150,7 @@ public abstract class ReleaseInformation {
 	 * @return
 	 */
 	public boolean hasOwnDbIndex(ComponentName component) {
-		return this.getDatabaseMapping(component)!=null;
+		return this.getDatabaseMapping(component) != null;
 	}
 
 	/**
@@ -143,18 +158,18 @@ public abstract class ReleaseInformation {
 	 * @return true if components of this release are covered by the given indices
 	 */
 	protected boolean containsIndices(IndicesEntryList indices) {
-		
-		if(this.dbMap.size()<=0) {
+
+		if (this.dbMap.size() <= 0) {
 			return false;
 		}
-		for(DatabaseInfo entry:this.dbMap.values()) {
+		for (DatabaseInfo entry : this.dbMap.values()) {
 			String dbIndexName = entry.getIndex(this.release.getDBSuffix());
-			if(indices.findByIndex(dbIndexName)==null) {
+			if (indices.findByIndex(dbIndexName) == null) {
 				return false;
 			}
 		}
 		return true;
-		
+
 	}
 
 	/**
@@ -163,13 +178,11 @@ public abstract class ReleaseInformation {
 	 */
 	protected abstract boolean runPreInitCommands(HtDatabaseClient dbClient);
 
-
 	/**
 	 * 
 	 * @param dbClient
 	 * @return if succeeded or not
 	 */
 	protected abstract boolean runPostInitCommands(HtDatabaseClient dbClient);
-	
 
 }
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 483ca0bc4..1ec19117b 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
@@ -37,23 +37,23 @@ import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.Release;
  */
 public class TestMigrationProvider {
 
-	  private static final String FRANKFURT_BACKUP_FILE = "src/test/resources/test2.bak.json";
-	public static HostInfo[] hosts = new HostInfo[] { new HostInfo("localhost", Integer
-	            .valueOf(System.getProperty("databaseport") != null ? System.getProperty("databaseport") : "49200")) };
+      private static final String FRANKFURT_BACKUP_FILE = "src/test/resources/test2.bak.json";
+    public static HostInfo[] hosts = new HostInfo[] { new HostInfo("localhost", Integer
+                .valueOf(System.getProperty("databaseport") != null ? System.getProperty("databaseport") : "49200")) };
 
-	@Test
-	public void testCreateImport() {
-		DataMigrationProviderImpl provider = new DataMigrationProviderImpl(hosts, null, null,true);
-		
-		try {
-			//create el alto db infrastructure
-			provider.initDatabase(Release.FRANKFURT_R1, 5, 1, "", true,10000);
-			//import data into database
-			DataMigrationReport report = provider.importData(FRANKFURT_BACKUP_FILE, false, Release.FRANKFURT_R1);
-			assertTrue(report.completed());
-			assertEquals(Release.FRANKFURT_R1, provider.autoDetectRelease());
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
-	}
+    @Test
+    public void testCreateImport() {
+        DataMigrationProviderImpl provider = new DataMigrationProviderImpl(hosts, null, null,true,5000);
+
+        try {
+            //create el alto db infrastructure
+            provider.initDatabase(Release.FRANKFURT_R1, 5, 1, "", true,10000);
+            //import data into database
+            DataMigrationReport report = provider.importData(FRANKFURT_BACKUP_FILE, false, Release.FRANKFURT_R1);
+            assertTrue(report.completed());
+            assertEquals(Release.FRANKFURT_R1, provider.autoDetectRelease());
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+    }
 }