[client] fix imageBaseWrite pushing to satellite

refactored UploadWizwardState variables

6 files changed, 172 insertions, 123 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
index 23acd65a..00e4c3ca 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
@@ -147,7 +147,6 @@ public class ImageListWindow extends ImageListWindowLayout {
 			}
 		});
 		//deleteImageVersion
-		deleteButton.setData(getCurrentImageSummaryRead());
 		deleteButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(final SelectionEvent e) {
@@ -161,7 +160,7 @@ public class ImageListWindow extends ImageListWindowLayout {
 					MainWindow.showMessageBox("IMAGE ONULL!", MessageType.ERROR, LOGGER, null);
 					return;
 				}
-				// TODO FIX THIS PIECE OF SHIT
+
 				QuickTimer.scheduleOnce(new Task() {
 					@Override
 					public void fire() {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
index d16f7768..4fb439b6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
@@ -62,21 +62,21 @@ public class ImageWizard extends Wizard {
 			LOGGER.error("Invalid state!");
 			return false;
 		} else {
-			LOGGER.debug(uploadWizardState.vmName);
-			LOGGER.debug(uploadWizardState.vmDescription);
-			LOGGER.debug(uploadWizardState.vmDescriptionFile.toString());
-			LOGGER.debug(uploadWizardState.vmDiskFile.toString());
-			LOGGER.debug(uploadWizardState.vmOperatingSystem.toString());
-			LOGGER.debug(uploadWizardState.vmVirtualizer.toString());
+			LOGGER.debug(uploadWizardState.name);
+			LOGGER.debug(uploadWizardState.description);
+			LOGGER.debug(uploadWizardState.descriptionFile.toString());
+			LOGGER.debug(uploadWizardState.diskFile.toString());
+			LOGGER.debug(uploadWizardState.operatingSystem.toString());
+			LOGGER.debug(uploadWizardState.virtualizer.toString());
 			LOGGER.debug(uploadWizardState.isTemplate);
-			LOGGER.debug(uploadWizardState.vmPerms.toString());
-			LOGGER.debug(uploadWizardState.vmShareMode.toString());
-			LOGGER.debug(uploadWizardState.vmUuid.toString());
+			LOGGER.debug(uploadWizardState.permissions.toString());
+			LOGGER.debug(uploadWizardState.shareMode.toString());
+			LOGGER.debug(uploadWizardState.uuid.toString());
 			// TODO run the actually request over external threaded class
 			try {
 				// push to sat
 				ThriftManager.getSatClient().updateImageBase(
-						Session.getSatelliteToken(), uploadWizardState.vmUuid.toString(), imageBaseWriteFromState());
+						Session.getSatelliteToken(), uploadWizardState.uuid.toString(), imageBaseWriteFromState());
 			} catch (TException e) {
 				LOGGER.error("Fail to push image metadata to satellite: ", e);
 				return false;
@@ -87,7 +87,7 @@ public class ImageWizard extends Wizard {
 		ImageDetailsRead imageDetailsRead = null;
 		try {
 			imageDetailsRead = ThriftManager.getSatClient().getImageDetails(Session.getSatelliteToken(),
-					uploadWizardState.vmUuid.toString());
+					uploadWizardState.uuid.toString());
 		} catch (TException e) {
 			LOGGER.error("Could not fetch image details of newly created image!", e);
 			return false;
@@ -103,73 +103,73 @@ public class ImageWizard extends Wizard {
 
 	private boolean isStateValid() {
 		// debug purposes
-		if (uploadWizardState.vmName == null || uploadWizardState.vmName.isEmpty()) {
+		if (uploadWizardState.name == null || uploadWizardState.name.isEmpty()) {
 			LOGGER.error("No name set in state!");
 			return false;
 		}
-		if (uploadWizardState.vmDescription == null || uploadWizardState.vmDescription.isEmpty()) {
+		if (uploadWizardState.description == null || uploadWizardState.description.isEmpty()) {
 			LOGGER.error("No description set in state!");
 			return false;
 		}
-		if (uploadWizardState.vmDescriptionFile == null) {
+		if (uploadWizardState.descriptionFile == null) {
 			LOGGER.error("No description file set in state!");
 			return false;
 		}	else {
-			if (!uploadWizardState.vmDescriptionFile.canRead()) {
-				LOGGER.error(uploadWizardState.vmDescriptionFile.getAbsolutePath()
+			if (!uploadWizardState.descriptionFile.canRead()) {
+				LOGGER.error(uploadWizardState.descriptionFile.getAbsolutePath()
 						+ " cannot be read!");
 				return false;
 			}
 		}
-		if (uploadWizardState.vmDiskFile == null) {
+		if (uploadWizardState.diskFile == null) {
 			LOGGER.error("No disk file set in state!");
 			return false;
 		}	else {
-			if (!uploadWizardState.vmDiskFile.canRead()) {
-				LOGGER.error(uploadWizardState.vmDiskFile.getAbsolutePath()
+			if (!uploadWizardState.diskFile.canRead()) {
+				LOGGER.error(uploadWizardState.diskFile.getAbsolutePath()
 						+ " cannot be read!");
 				return false;
 			}
 		}
-		if (uploadWizardState.vmOperatingSystem == null) {
+		if (uploadWizardState.operatingSystem == null) {
 			LOGGER.error("No OS set in state!");
 			return false;
 		}	else {
-			if (!(uploadWizardState.vmOperatingSystem.isSetArchitecture()
-					&& uploadWizardState.vmOperatingSystem.isSetOsId()
-					&& uploadWizardState.vmOperatingSystem.isSetOsName()
-					&& uploadWizardState.vmOperatingSystem.isSetVirtualizerOsId())) {
-				LOGGER.error("OS has missing fields: " + uploadWizardState.vmOperatingSystem.toString());
+			if (!(uploadWizardState.operatingSystem.isSetArchitecture()
+					&& uploadWizardState.operatingSystem.isSetOsId()
+					&& uploadWizardState.operatingSystem.isSetOsName()
+					&& uploadWizardState.operatingSystem.isSetVirtualizerOsId())) {
+				LOGGER.error("OS has missing fields: " + uploadWizardState.operatingSystem.toString());
 				return false;
 			}
 		}
-		if (uploadWizardState.vmVirtualizer == null) {
+		if (uploadWizardState.virtualizer == null) {
 			LOGGER.error("No virtualizer set in state!");
 			return false;
 		}	else {
-			if (!(uploadWizardState.vmVirtualizer.isSetVirtId()
-					&& uploadWizardState.vmVirtualizer.isSetVirtName())) {
-				LOGGER.error("Virtualizer has missing fields: " + uploadWizardState.vmVirtualizer.toString());
+			if (!(uploadWizardState.virtualizer.isSetVirtId()
+					&& uploadWizardState.virtualizer.isSetVirtName())) {
+				LOGGER.error("Virtualizer has missing fields: " + uploadWizardState.virtualizer.toString());
 				return false;
 			}
 		}
-		if (uploadWizardState.vmPerms == null) {
+		if (uploadWizardState.permissions == null) {
 			LOGGER.error("No permissions set in state!");
 			return false;
 		}	else {
-			if (!(uploadWizardState.vmPerms.isSetAdmin()
-					&& uploadWizardState.vmPerms.isSetDownload()
-					&& uploadWizardState.vmPerms.isSetEdit()
-					&& uploadWizardState.vmPerms.isSetLink())) {
-				LOGGER.error("Virtualizer has missing fields: " + uploadWizardState.vmOperatingSystem.toString());
+			if (!(uploadWizardState.permissions.isSetAdmin()
+					&& uploadWizardState.permissions.isSetDownload()
+					&& uploadWizardState.permissions.isSetEdit()
+					&& uploadWizardState.permissions.isSetLink())) {
+				LOGGER.error("Virtualizer has missing fields: " + uploadWizardState.operatingSystem.toString());
 				return false;
 			}
 		}
-		if (uploadWizardState.vmShareMode == null) {
+		if (uploadWizardState.shareMode == null) {
 			LOGGER.error("No share mode set in state!");
 			return false;
 		}
-		if (uploadWizardState.vmUuid == null) {
+		if (uploadWizardState.uuid == null) {
 			LOGGER.error("No uuid set in state!");
 			return false;
 		}
@@ -179,12 +179,12 @@ public class ImageWizard extends Wizard {
 	private ImageBaseWrite imageBaseWriteFromState() {
 		// build imageBaseWrite
 		return new ImageBaseWrite(
-				uploadWizardState.vmName,
-				uploadWizardState.vmDescription,
-				uploadWizardState.vmOperatingSystem.getOsId(),
-				uploadWizardState.vmVirtualizer.getVirtId(),
+				uploadWizardState.name,
+				uploadWizardState.description,
+				uploadWizardState.operatingSystem.getOsId(),
+				uploadWizardState.virtualizer.getVirtId(),
 				uploadWizardState.isTemplate,
-				uploadWizardState.vmPerms,
-				uploadWizardState.vmShareMode);
+				uploadWizardState.permissions,
+				uploadWizardState.shareMode);
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
index 6bd95176..921dc6d6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
@@ -15,6 +15,7 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 	protected Composite container;
 	protected Button imageFileBrowseButton;
 	protected Text imageFileTextField;
+	protected Button startUploadButton;
 
 	/**
 	 * Page for uploading an imagefile
@@ -34,7 +35,7 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 		GridLayout layout = new GridLayout();
 		layout.verticalSpacing = 16;
 		container.setLayout(layout);
-		layout.numColumns = 3;
+		layout.numColumns = 4;
 
 		// -- Browse for VM --
 		Label imageFileCaption = new Label(container, SWT.NONE);
@@ -43,15 +44,20 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 		imageFileBrowseButton.setText("Browse");
 		imageFileTextField = new Text(container, SWT.BORDER | SWT.SINGLE);
 		imageFileTextField.setEditable(false);
-		imageFileTextField.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+		GridData gdImageFileTextField = new GridData(SWT.FILL, SWT.FILL, true, false);
+		gdImageFileTextField.horizontalSpan = 2;
+		imageFileTextField.setLayoutData(gdImageFileTextField);
 
 		Label imageNameCaption = new Label(container, SWT.NONE);
 		imageNameCaption.setText("Name des Images");
 
 		imageNameTextField = new Text(container, SWT.BORDER | SWT.SINGLE);
-		GridData gdNameField = new GridData(GridData.FILL_HORIZONTAL);
-		gdNameField.horizontalSpan = 2;
-		imageNameTextField.setLayoutData(gdNameField);
+		GridData gdimageNameTextField = new GridData(GridData.FILL_HORIZONTAL);
+		gdimageNameTextField.horizontalSpan = 2;
+		imageNameTextField.setLayoutData(gdimageNameTextField);
+
+		startUploadButton = new Button(container, SWT.PUSH);
+		startUploadButton.setText("Upload");
 
 		setControl(container);
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index 5012fdb9..ae8f394f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -31,13 +31,13 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		setPageComplete(false);
 
 		// HACK set fixed uploadWizardState to test functions
-		uploadWizardState.vmDiskFile = uploadWizardState.vmDescriptionFile;
+		uploadWizardState.diskFile = uploadWizardState.descriptionFile;
 		uploadWizardState.isTemplate = false;
-		uploadWizardState.vmPerms = new ImagePermissions(true, false, true, false);
-		uploadWizardState.vmShareMode = ShareMode.LOCAL;
-		uploadWizardState.vmVirtualizer = MetaDataCache.getVirtualizers().get(0);
-		uploadWizardState.vmOperatingSystem = MetaDataCache.getOperatingSystems().get(0);
-		uploadWizardState.vmOperatingSystem.putToVirtualizerOsId(uploadWizardState.vmVirtualizer.getVirtName(), uploadWizardState.vmVirtualizer.getVirtId());
+		uploadWizardState.permissions = new ImagePermissions(true, false, true, false);
+		uploadWizardState.shareMode = ShareMode.LOCAL;
+		uploadWizardState.virtualizer = MetaDataCache.getVirtualizers().get(0);
+		uploadWizardState.operatingSystem = MetaDataCache.getOperatingSystems().get(0);
+		uploadWizardState.operatingSystem.putToVirtualizerOsId(uploadWizardState.virtualizer.getVirtName(), uploadWizardState.virtualizer.getVirtId());
 	}
 	
 	@Override
@@ -68,12 +68,12 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 			public void widgetSelected(SelectionEvent e) {
 				int selectionIndex = osCombo.getSelectionIndex();
 				if (osCombo.getSelectionIndex() != -1) {
-					uploadWizardState.vmOperatingSystem =
+					uploadWizardState.operatingSystem =
 						(OperatingSystem) osCombo.getData(osCombo.getItem(selectionIndex));
-					LOGGER.debug(uploadWizardState.vmOperatingSystem.toString());
-					uploadWizardState.vmVirtualizer = MetaDataCache.getVirtualizers().get(0);
-					uploadWizardState.vmOperatingSystem.virtualizerOsId = new HashMap<String , String>() {{
-				    put(uploadWizardState.vmVirtualizer.getVirtName(), uploadWizardState.vmVirtualizer.getVirtId());
+					LOGGER.debug(uploadWizardState.operatingSystem.toString());
+					uploadWizardState.virtualizer = MetaDataCache.getVirtualizers().get(0);
+					uploadWizardState.operatingSystem.virtualizerOsId = new HashMap<String , String>() {{
+				    put(uploadWizardState.virtualizer.getVirtName(), uploadWizardState.virtualizer.getVirtId());
 				}};
 				}
 			}
@@ -87,7 +87,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 			@Override
 			public void keyReleased(KeyEvent e) {
 				if (!descriptionText.getText().isEmpty()) {
-					uploadWizardState.vmDescription = descriptionText.getText();
+					uploadWizardState.description = descriptionText.getText();
 					setPageComplete(true);
 				}
 			}
@@ -96,25 +96,25 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		readPermissionsCheck.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				uploadWizardState.vmPerms.download = readPermissionsCheck.getSelection();
+				uploadWizardState.permissions.download = readPermissionsCheck.getSelection();
 			}
 		});
 		linkPermissionsCheck.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				uploadWizardState.vmPerms.link = linkPermissionsCheck.getSelection();
+				uploadWizardState.permissions.link = linkPermissionsCheck.getSelection();
 			}
 		});
 		writePermissionsCheck.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				uploadWizardState.vmPerms.edit = writePermissionsCheck.getSelection();
+				uploadWizardState.permissions.edit = writePermissionsCheck.getSelection();
 			}
 		});
 		adminPermissionsCheck.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				uploadWizardState.vmPerms.admin = adminPermissionsCheck.getSelection();
+				uploadWizardState.permissions.admin = adminPermissionsCheck.getSelection();
 			}
 		});
 		// -- end checkboxes for permissions --
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
index ce4dc203..f9ea580f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
@@ -13,6 +13,8 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.FileDialog;
+import org.openslx.bwlp.thrift.iface.ImageBaseWrite;
+import org.openslx.bwlp.thrift.iface.TransferInformation;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
@@ -33,7 +35,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 
 	private UploadWizardState uploadWizardState;
 	protected final boolean editExistingImage;
-
+	
 	public ImageUploadPage(UploadWizardState uploadWizardState, boolean editExistingImage) {
 		super();
 		setPageComplete(false);
@@ -53,7 +55,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			@Override
 			public void keyReleased(KeyEvent e) {
 				if (!imageNameTextField.getText().isEmpty()) {
-					setPageComplete(uploadWizardState.vmDescriptionFile != null);
+					setPageComplete(uploadWizardState.descriptionFile != null);
 				} else
 					setPageComplete(false);
 			}
@@ -77,7 +79,18 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});
+		startUploadButton.addSelectionListener(new SelectionListener() {
 
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				createAndUploadImage();
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+		startUploadButton.setEnabled(false);
 	}
 
 	private void vmxSelected(File file) {
@@ -110,7 +123,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			// Allow to continue!? 
 		}
 		// vmx ok, set it as our description file
-		uploadWizardState.vmDescriptionFile = file;
+		uploadWizardState.descriptionFile = file;
 		// now check the disk files
 		File vmDiskFileInfo = new File(hdds.get(0).diskImage);
 		if (!vmDiskFileInfo.isAbsolute()) {
@@ -122,7 +135,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			vmDiskFileInfo = new File(vmxBaseDirectory, hdds.get(0).diskImage);
 		}
 		if (vmDiskFileInfo.canRead()) {
-			uploadWizardState.vmDiskFile = vmDiskFileInfo;
+			uploadWizardState.diskFile = vmDiskFileInfo;
 		}	else {
 			setErrorMessage("'" + vmDiskFileInfo.getPath() + "' kann nicht gelesen werden!");
 			setPageComplete(false);
@@ -131,9 +144,10 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 		if (imageNameTextField.getText().isEmpty()) {
 			imageNameTextField.setText(meta.getDisplayName());
 		}
-		uploadWizardState.vmOperatingSystem = meta.getOs();
+		uploadWizardState.operatingSystem = meta.getOs();
 		imageFileTextField.setText(file.getAbsolutePath());
-		setPageComplete(!imageNameTextField.getText().isEmpty());
+		startUploadButton.setEnabled(true);
+//		setPageComplete(!imageNameTextField.getText().isEmpty());
 	}
 
 	/* Override setVisible() to inject some code when this page is set visible
@@ -145,51 +159,75 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 	public void setVisible(boolean visible) {
 		if (getControl().isVisible() && !visible) {
 			LOGGER.debug("Leaving ImageUploadPage...");
-			// currently shown and about to be hidden = we're switching to another page
-			if (uploadWizardState.vmUuid != null) {
-				LOGGER.debug("UUID already set: " + uploadWizardState.vmUuid);
-			} else {
-				uploadWizardState.vmName = imageNameTextField.getText();
-				if (Session.getSatelliteToken() == null)
-					LOGGER.error("No session token");
-				else
-					LOGGER.debug(Session.getSatelliteToken());
-
-				// async creation of the image
-				QuickTimer.scheduleOnce(new Task() {
-					UUID newImageUUID = null;
 
+		}
+		super.setVisible(visible);
+	}
+
+	private void createAndUploadImage() {
+		// first get the image name from the field
+		// (either auto filled by VmwareMetaData or by user)
+		uploadWizardState.name = imageNameTextField.getText();
+
+		// schedule task to create the image if we have no UUID
+		// and to request the upload once we received that UUID. 
+		QuickTimer.scheduleOnce(new Task() {
+			@Override
+			public void fire() {
+				// -- create image --
+				if (uploadWizardState.uuid == null) {
+					LOGGER.debug("Creating image...");
+					try {
+						uploadWizardState.uuid = ThriftManager.getSatClient().createImage(
+								Session.getSatelliteToken(), uploadWizardState.name);
+					} catch (Exception e) {
+						LOGGER.error("Error while creating image: ", e);
+						return;
+					}
+				}
+				if (uploadWizardState.transferInformation == null) {
+					// -- request upload --
+					LOGGER.debug("Requesting upload...");
+					try {
+						uploadWizardState.transferInformation = ThriftManager.getSatClient().requestImageVersionUpload(
+								Session.getSatelliteToken(), uploadWizardState.uuid, uploadWizardState.diskFile.length(), null);
+					} catch (Exception e) {
+						LOGGER.error("Error while requesting download for: " + uploadWizardState.uuid, e);
+						return;
+					}
+				}
+				Gui.display.asyncExec(new Runnable() {
 					@Override
-					public void fire() {
-						try {
-							newImageUUID = UUID.fromString(ThriftManager.getSatClient().createImage(
-									Session.getSatelliteToken(), uploadWizardState.vmName));
-						} catch (Exception e) {
-							LOGGER.error("Error while creating image: ", e);
-							return;
-						}
-						Gui.display.asyncExec(new Runnable() {
-							@Override
-							public void run() {
-								createImageCallback(newImageUUID);
-							}
-						});
+					public void run() {
+						createAndUploadImageCallback();
 					}
 				});
 			}
-		}
-		super.setVisible(visible);
+		});
 	}
 
-	public void createImageCallback(UUID uuid) {
-		if (uuid != null) {
-			// set it
-			LOGGER.debug("Received UUID from satellite: " + uuid.toString());
-			uploadWizardState.vmUuid = uuid;
-			imageNameTextField.setEnabled(false);
-		} else
-			LOGGER.error("Null UUID returned from the createImage() runnable!");
-
-		// TODO start upload
+	public void createAndUploadImageCallback() {
+		LOGGER.debug("callback");
+		// always disable "Browse" and "Image Name" field
+		imageNameTextField.setEnabled(false);
+		imageFileBrowseButton.setEnabled(false);
+		// -- check image creation --
+		if (uploadWizardState.uuid != null) {
+			// we just created the image, remember uuid	
+			LOGGER.debug("Received UUID from satellite: " + uploadWizardState.uuid);
+			uploadWizardState.uuid = uploadWizardState.uuid;
+		} else {
+			LOGGER.debug("null uuid");
+		}
+		// -- check request upload --
+		if (uploadWizardState.transferInformation != null) {
+			// request "granted"
+			LOGGER.debug("Transfer request granted.");
+			uploadWizardState.transferInformation = uploadWizardState.transferInformation;
+		} else {
+			LOGGER.debug("null ti");
+		}
+		setPageComplete(uploadWizardState.uuid != null
+				&& uploadWizardState.transferInformation != null);
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
index 471132cc..c257251d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
@@ -6,28 +6,34 @@ import java.util.UUID;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.ShareMode;
+import org.openslx.bwlp.thrift.iface.TransferInformation;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
 
 public class UploadWizardState {
+	// -- objects of the GUI itself --
 	// name of the virtual machine as entered by the user
-	public String vmName;
+	public String name = null;
 	// description of the virtual machine as entered by the user
-	public String vmDescription;
+	public String description = null;
 	// operating system of the virtual machine to be uploaded
-	public OperatingSystem vmOperatingSystem;
+	public OperatingSystem operatingSystem = null;
 	// description file of the virtual machine to be uploaded
-	public File vmDescriptionFile;
+	public File descriptionFile = null;
 	// disk file of the virtual machine to be uploaded
-	public File vmDiskFile;
-	// UUID given returned by the satellite after creating the image
-	public UUID vmUuid;
+	public File diskFile = null;
 	// flags an image as a template
-	public Boolean isTemplate;
+	public Boolean isTemplate = null;
 	// virtualizer for this image (vmware, vbox..)
-	public Virtualizer vmVirtualizer;
+	public Virtualizer virtualizer = null;
 	// permissions assigned to that image by the user
 	// TODO: defaults per sat
-	public ImagePermissions vmPerms;
-	// local, publish, download frozen share mode (see bwlp.thrift in mss)
-	public ShareMode vmShareMode;
+	public ImagePermissions permissions = null;
+	// local, publish, download frozen share mode
+	public ShareMode shareMode = null;
+	
+	// -- Objects returned by thrift calls --
+	// UUID given returned by the satellite after creating the image
+	public String uuid = null;
+	// transfer information for upload received if the upload request was granted 
+	public TransferInformation transferInformation = null;
 }