Arik Hadas has uploaded a new change for review.
Change subject: frontend: add text field for suffix to all cloned vms
......................................................................
frontend: add text field for suffix to all cloned vms
Change-Id: I3ae6d3f4103323719df085ad096ee9b208d3ad72
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.ui.xml
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.ui.xml
6 files changed, 41 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/34236/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
index f29971e..73578ca 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
@@ -63,6 +63,7 @@
private Map<Guid, ArrayList<Quota>> storageQuotaMap;
private final Map<Guid, List<Disk>> templateDiskMap = new HashMap<Guid,
List<Disk>>();
private final Map<Guid, ImportDiskData> diskImportDataMap = new
HashMap<Guid, ImportDiskData>();
+ private EntityModel<String> suffix;
public StoragePool getStoragePool() {
return storagePool;
@@ -178,6 +179,7 @@
setClusterQuota(new ListModel());
getClusterQuota().setIsAvailable(false);
setCpuProfiles(new ListModel<CpuProfile>());
+ setSuffix(new EntityModel<String>());
}
public void init(List items, final Guid storageDomainId) {
@@ -678,4 +680,12 @@
getCommands().add(getCloseCommand());
stopProgress();
}
+
+ public EntityModel<String> getSuffix() {
+ return suffix;
+ }
+
+ public void setSuffix(EntityModel<String> suffix) {
+ this.suffix = suffix;
+ }
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
index 6c013f2..6ed3321 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
@@ -64,6 +64,7 @@
private VmImportDiskListModel importDiskListModel;
private List<Network> networks;
private List<VnicProfileView> networkProfiles;
+ private EntityModel<String> suffix;
public List<Network> getNetworks() {
return networks;
@@ -144,6 +145,7 @@
setClusterQuota(new ListModel());
getClusterQuota().setIsAvailable(false);
setCpuProfiles(new ListModel<CpuProfile>());
+ setSuffix(new EntityModel<String>());
}
public void setItems(final Collection value, final Guid storageDomainId)
@@ -544,4 +546,12 @@
ImportNetworkData importData = networkImportDataMap.get(macAddr);
return importData;
}
+
+ public EntityModel<String> getSuffix() {
+ return suffix;
+ }
+
+ public void setSuffix(EntityModel<String> suffix) {
+ this.suffix = suffix;
+ }
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
index 3f027cb..2a423db 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java
@@ -19,6 +19,7 @@
import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor;
import org.ovirt.engine.ui.common.widget.editor.ListModelObjectCellTable;
+import
org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor;
import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer;
import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer;
import
org.ovirt.engine.ui.common.widget.renderer.StorageDomainFreeSpaceRenderer;
@@ -52,6 +53,7 @@
import com.google.gwt.dom.client.Style.Position;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.editor.client.SimpleBeanEditorDriver;
+import com.google.gwt.editor.client.Editor.Path;
import com.google.gwt.event.logical.shared.SelectionEvent;
import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.event.shared.EventBus;
@@ -97,6 +99,10 @@
@UiField(provided = true)
@Path(value = "storage.selectedItem")
ListModelListBoxEditor<Object> destStorageEditor;
+
+ @UiField(provided = true)
+ @Path(value = "suffix.entity")
+ StringEntityModelTextBoxEditor clonedSuffixEditor;
@UiField
SplitLayoutPanel splitLayoutPanel;
@@ -638,6 +644,7 @@
return object.getName();
}
});
+ clonedSuffixEditor = new StringEntityModelTextBoxEditor();
}
private void localize(ApplicationConstants constants) {
@@ -645,6 +652,7 @@
destClusterQuotaEditor.setLabel(constants.importVm_destClusterQuota());
destStorageEditor.setLabel(constants.defaultStorage());
cpuProfileEditor.setLabel(constants.cpuProfileLabel());
+ clonedSuffixEditor.setLabel(constants.cloneImportSuffixVm());
}
@SuppressWarnings("unchecked")
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.ui.xml
index 2764787..56c0d35 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.ui.xml
@@ -2,6 +2,7 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";>
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog"
+ xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic"
xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"
xmlns:t="urn:import:org.ovirt.engine.ui.common.widget.dialog.tab">
<ui:with field='resources'
@@ -83,6 +84,7 @@
<e:ListModelListBoxEditor
ui:field="destStorageEditor" addStyleNames="{style.listBoxEditor}"/>
<e:ListModelListBoxEditor
ui:field="destClusterEditor" addStyleNames="{style.listBoxEditor}"/>
<e:ListModelListBoxEditor
ui:field="cpuProfileEditor" addStyleNames="{style.listBoxEditor}"/>
+ <ge:StringEntityModelTextBoxEditor
ui:field="clonedSuffixEditor" addStyleNames="{style.listBoxEditor}"/>
</g:VerticalPanel>
<g:VerticalPanel>
<e:ListModelListBoxEditor
ui:field="destStorageQuotaEditor"
addStyleNames="{style.destStorageQuotaEditor}"/>
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.java
index aebd459..df526d0 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.java
@@ -23,6 +23,7 @@
import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor;
import org.ovirt.engine.ui.common.widget.editor.ListModelObjectCellTable;
+import
org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor;
import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer;
import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer;
import
org.ovirt.engine.ui.common.widget.renderer.StorageDomainFreeSpaceRenderer;
@@ -100,6 +101,10 @@
@UiField(provided = true)
@Path(value = "storage.selectedItem")
ListModelListBoxEditor<Object> destStorageEditor;
+
+ @UiField(provided = true)
+ @Path(value = "suffix.entity")
+ StringEntityModelTextBoxEditor clonedSuffixEditor;
@UiField
SplitLayoutPanel splitLayoutPanel;
@@ -268,6 +273,7 @@
destClusterQuotaEditor.setLabel(constants.importVm_destClusterQuota());
destStorageEditor.setLabel(constants.defaultStorage());
cpuProfileEditor.setLabel(constants.cpuProfileLabel());
+ clonedSuffixEditor.setLabel(constants.cloneImportSuffixVm());
}
private void initListBoxEditors() {
@@ -292,6 +298,7 @@
return object.getName();
}
});
+ clonedSuffixEditor = new StringEntityModelTextBoxEditor();
}
@Override
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.ui.xml
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.ui.xml
index 9e68d0c..059d18e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.ui.xml
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/ImportVmFromExternalProviderPopupView.ui.xml
@@ -3,6 +3,7 @@
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog"
xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"
+ xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic"
xmlns:t="urn:import:org.ovirt.engine.ui.common.widget.dialog.tab">
<ui:with field='resources'
type='org.ovirt.engine.ui.webadmin.ApplicationResources' />
@@ -73,7 +74,7 @@
width: 515px;
}
</ui:style>
- <d:SimpleDialogPanel height="575px" width="1000px">
+ <d:SimpleDialogPanel height="600px" width="1000px">
<d:content>
<g:VerticalPanel>
<g:HorizontalPanel>
@@ -83,6 +84,7 @@
<e:ListModelListBoxEditor
ui:field="destStorageEditor" addStyleNames="{style.listBoxEditor}"/>
<e:ListModelListBoxEditor
ui:field="destClusterEditor" addStyleNames="{style.listBoxEditor}"/>
<e:ListModelListBoxEditor
ui:field="cpuProfileEditor" addStyleNames="{style.listBoxEditor}"/>
+ <ge:StringEntityModelTextBoxEditor
ui:field="clonedSuffixEditor" addStyleNames="{style.listBoxEditor}"/>
</g:VerticalPanel>
<g:VerticalPanel>
<e:ListModelListBoxEditor
ui:field="destClusterQuotaEditor" />
@@ -90,9 +92,9 @@
</g:HorizontalPanel>
</g:VerticalPanel>
</g:HorizontalPanel>
- <g:Label ui:field="message" addStyleNames="{style.labelStyle}"
/>
<g:SplitLayoutPanel ui:field="splitLayoutPanel"
height="360px"
addStyleNames="{style.splitLayoutPanelStyle}" />
+ <g:Label ui:field="message" addStyleNames="{style.labelStyle}"
/>
</g:VerticalPanel>
</d:content>
</d:SimpleDialogPanel>
--
To view, visit http://gerrit.ovirt.org/34236
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ae6d3f4103323719df085ad096ee9b208d3ad72
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
