summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
index b16a9785..c2db8554 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
@@ -20,7 +20,7 @@ import org.openslx.dozmod.thrift.ThriftError;
import org.openslx.dozmod.thrift.UploadInitiator;
import org.openslx.dozmod.thrift.WrappedException;
import org.openslx.dozmod.thrift.cache.MetaDataCache;
-import org.openslx.vm.DockerMetaDataDummy;
+import org.openslx.virtualization.configuration.VirtualizationConfigurationDocker;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -32,6 +32,7 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.File;
import java.io.IOException;
+import java.nio.ByteBuffer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -253,7 +254,7 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
return true;
}
- private DockerMetaDataDummy createVmMeta() {
+ private VirtualizationConfigurationDocker createVirtualizationConfig() {
ContainerMeta containerMeta = containerDefinition.getContainerMeta();
containerMeta.setBuildContextMethod(getBuildContextMethod().ordinal());
@@ -275,7 +276,7 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
state.descriptionFile = getDummyFile();
break;
}
- return containerDefinition.createVmMeta();
+ return containerDefinition.createVirtualizationConfig();
}
/**
@@ -295,7 +296,7 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
// get the image name either auto filled by VmwareMetaData or by user
// get the image name from the image we are uploading a new version of
state.name = existingImage != null ? existingImage.getImageName() : txtImageName.getText();
- state.meta = createVmMeta();
+ state.virtualizationConfig = createVirtualizationConfig();
// -- create image to get uuid --
if (existingImage == null) {
@@ -315,7 +316,7 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
if (state.upload == null) {
try {
state.upload = new UploadInitiator(state.uuid, state.diskFile,
- state.meta.getFilteredDefinition());
+ ByteBuffer.wrap(state.virtualizationConfig.getConfigurationAsByteArray()));
} catch (WrappedException e) {
ThriftError.showMessage(this, LOGGER, e.exception, e.displayMessage);
return false;