From 85da408a94f5e6c1b77a4d45f8462fd759705fff Mon Sep 17 00:00:00 2001 From: ralph isenmann Date: Wed, 19 Aug 2020 10:13:31 +0200 Subject: Create Object of DockerMetaDataDummy VmMetaDate.getInstance of a DockerMetaDataDummy --- src/main/java/org/openslx/util/vm/DockerMetaDataDummy.java | 4 ++++ src/main/java/org/openslx/util/vm/VmMetaData.java | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/org/openslx/util/vm/DockerMetaDataDummy.java b/src/main/java/org/openslx/util/vm/DockerMetaDataDummy.java index 473f1c0..3ee964f 100644 --- a/src/main/java/org/openslx/util/vm/DockerMetaDataDummy.java +++ b/src/main/java/org/openslx/util/vm/DockerMetaDataDummy.java @@ -14,6 +14,10 @@ public class DockerMetaDataDummy extends VmMetaData { private final Virtualizer virtualizer = new Virtualizer( TConst.VIRT_DOCKER, "Docker" ); + /* this field is in vm context the machine description + e.g. vmware = vmx. + This field will be stored in table imageversion.virtualizerconfig + */ private byte[] dockerfile; public DockerMetaDataDummy(List osList, File file) { diff --git a/src/main/java/org/openslx/util/vm/VmMetaData.java b/src/main/java/org/openslx/util/vm/VmMetaData.java index 0d191e5..c836697 100644 --- a/src/main/java/org/openslx/util/vm/VmMetaData.java +++ b/src/main/java/org/openslx/util/vm/VmMetaData.java @@ -313,6 +313,8 @@ public abstract class VmMetaData LOGGER.info( "Not a QEmu file", e ); } try { + // TODO This will work for each file because simple read as byte array + // TODO No checks if file is a dockerfile --- THIS SHOOULD NOT BE IN PRODUCTION return new DockerMetaDataDummy(osList, file); } catch ( Exception e ) { LOGGER.info( "Not a docker file", e ); @@ -343,6 +345,14 @@ public abstract class VmMetaData } catch ( UnsupportedVirtualizerFormatException e ) { exceptions.put( "Not a VirtualBox file", e ); } + try { + // TODO This should work in each case, because no checks if vmContent is dockerfile + // TODO --- THIS SHOULD NOT BE IN PRODUCTION + LOGGER.info("Creating DockerMetaDataDummy from vmContent"); + return new DockerMetaDataDummy(osList, vmContent, length); + } catch (Exception e) { + e.printStackTrace(); + } // TODO QEmu -- hack above expects qcow2 file, so we can't do anything here yet LOGGER.error( "Could not detect any known virtualizer format" ); for ( Entry e : exceptions.entrySet() ) { -- cgit v1.2.3-55-g7522