Using parent data source ID for all extracted VMs

This commit is contained in:
Eugene Livis 2016-02-02 17:27:18 -05:00
parent f3078f454c
commit a4188895d8

View File

@ -171,8 +171,6 @@ final class VMExtractorIngestModule extends DataSourceIngestModuleAdapter {
progressBar.progress(NbBundle.getMessage(this.getClass(), "VMExtractorIngestModule.queuingIngestJobs.message")); progressBar.progress(NbBundle.getMessage(this.getClass(), "VMExtractorIngestModule.queuingIngestJobs.message"));
// this is for progress bar purposes because at this point we only know in advance how many job folders to ingest, not how many data sources. // this is for progress bar purposes because at this point we only know in advance how many job folders to ingest, not how many data sources.
int numJobsQueued = 0; int numJobsQueued = 0;
// keeps track of number of VMs ingested. A job folder may contain multiple VMs.
int numDataSourcesQueued = 0;
// start processing output folders after we are done writing out all vm files // start processing output folders after we are done writing out all vm files
for (String folder : imageFolderToOutputFolder.values()) { for (String folder : imageFolderToOutputFolder.values()) {
if (context.dataSourceIngestIsCancelled()) { if (context.dataSourceIngestIsCancelled()) {
@ -183,11 +181,9 @@ final class VMExtractorIngestModule extends DataSourceIngestModuleAdapter {
try { try {
logger.log(Level.INFO, "Ingesting virtual machine file {0} in folder {1}", new Object[]{file, folder}); //NON-NLS logger.log(Level.INFO, "Ingesting virtual machine file {0} in folder {1}", new Object[]{file, folder}); //NON-NLS
// for extracted virtual machines there is no manifest XML file to read data source ID from so we need to create one // for extracted virtual machines there is no manifest XML file to read data source ID from so use parent data source ID.
numDataSourcesQueued++;
String dataSourceID = parentDataSourceId + "-VM" + numDataSourcesQueued; //NON-NLS
// ingest the data sources // ingest the data sources
ingestVirtualMachineImage(Paths.get(folder, file), dataSourceID); ingestVirtualMachineImage(Paths.get(folder, file), parentDataSourceId);
logger.log(Level.INFO, "Ingest complete for virtual machine file {0} in folder {1}", new Object[]{file, folder}); //NON-NLS logger.log(Level.INFO, "Ingest complete for virtual machine file {0} in folder {1}", new Object[]{file, folder}); //NON-NLS
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
logger.log(Level.INFO, "Interrupted while ingesting virtual machine file "+file+" in folder "+folder, ex); //NON-NLS logger.log(Level.INFO, "Interrupted while ingesting virtual machine file "+file+" in folder "+folder, ex); //NON-NLS