Arik Hadas has uploaded a new change for review.
Change subject: userportal: do not use AddVmFromScratch
......................................................................
userportal: do not use AddVmFromScratch
The UI doesn't provide disks to the AddVmFromScratch command so it
should use AddVm instead.
Change-Id: Ibd7f9cf4e6a9bcb2b336b34c785c09221068a915
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
1 file changed, 37 insertions(+), 50 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/33142/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
index c48618d..ed2c0ba 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
@@ -8,7 +8,6 @@
import java.util.List;
import org.ovirt.engine.core.common.VdcActionUtils;
-import org.ovirt.engine.core.common.action.AddVmParameters;
import org.ovirt.engine.core.common.action.AddVmTemplateParameters;
import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters;
import org.ovirt.engine.core.common.action.ChangeVMClusterParameters;
@@ -1090,61 +1089,49 @@
if (model.getIsNew())
{
- if (gettempVm().getVmtGuid().equals(Guid.Empty))
+ setstorageDomain(model.getStorageDomain().getSelectedItem());
+
+ if (model.getProvisioning().getEntity())
{
- AddVmParameters parameters = new AddVmParameters(gettempVm());
- parameters.setMakeCreatorExplicitOwner(true);
-
parameters.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity());
-
parameters.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity());
- setRngDeviceToParams(model, parameters);
-
Frontend.getInstance().runAction(VdcActionType.AddVmFromScratch, parameters,
new UnitVmModelNetworkAsyncCallback(model, defaultNetworkCreatingManager),
this);
+ AsyncQuery _asyncQuery = new AsyncQuery();
+ _asyncQuery.setModel(this);
+ _asyncQuery.asyncCallback = new INewAsyncCallback() {
+ @Override
+ public void onSuccess(Object model, Object result)
+ {
+ UserPortalListModel userPortalListModel1 =
(UserPortalListModel) model;
+ final UnitVmModel unitVmModel = (UnitVmModel)
userPortalListModel1.getWindow();
+
+ VM vm = gettempVm();
+
vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(unitVmModel.getTemplate().getSelectedItem().getTemplateVersionName()));
+
+ VmManagementParametersBase param = new
VmManagementParametersBase(vm);
+
param.setDiskInfoDestinationMap(unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap());
+ param.setMakeCreatorExplicitOwner(true);
+
param.setCopyTemplatePermissions(unitVmModel.getCopyPermissions().getEntity());
+
+
param.setSoundDeviceEnabled(unitVmModel.getIsSoundcardEnabled().getEntity());
+
param.setConsoleEnabled(unitVmModel.getIsConsoleDeviceEnabled().getEntity());
+ setRngDeviceToParams(unitVmModel, param);
+
Frontend.getInstance().runAction(VdcActionType.AddVmFromTemplate, param, new
UnitVmModelNetworkAsyncCallback(unitVmModel, defaultNetworkCreatingManager),
this);
+ }
+ };
+
AsyncDataProvider.getInstance().getTemplateDiskList(_asyncQuery,
gettempVm().getVmtGuid());
}
else
{
- setstorageDomain(model.getStorageDomain().getSelectedItem());
+ VM vm = gettempVm();
+
vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(model.getTemplate().getSelectedItem().getTemplateVersionName()));
- if (model.getProvisioning().getEntity())
- {
- AsyncQuery _asyncQuery = new AsyncQuery();
- _asyncQuery.setModel(this);
- _asyncQuery.asyncCallback = new INewAsyncCallback() {
- @Override
- public void onSuccess(Object model, Object result)
- {
- UserPortalListModel userPortalListModel1 =
(UserPortalListModel) model;
- final UnitVmModel unitVmModel = (UnitVmModel)
userPortalListModel1.getWindow();
+ VmManagementParametersBase param = new
VmManagementParametersBase(vm);
+
param.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap());
+ param.setMakeCreatorExplicitOwner(true);
+
param.setCopyTemplatePermissions(model.getCopyPermissions().getEntity());
- VM vm = gettempVm();
-
vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(unitVmModel.getTemplate().getSelectedItem().getTemplateVersionName()));
-
- VmManagementParametersBase param = new
VmManagementParametersBase(vm);
-
param.setDiskInfoDestinationMap(unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap());
- param.setMakeCreatorExplicitOwner(true);
-
param.setCopyTemplatePermissions(unitVmModel.getCopyPermissions().getEntity());
-
-
param.setSoundDeviceEnabled(unitVmModel.getIsSoundcardEnabled().getEntity());
-
param.setConsoleEnabled(unitVmModel.getIsConsoleDeviceEnabled().getEntity());
- setRngDeviceToParams(unitVmModel, param);
-
Frontend.getInstance().runAction(VdcActionType.AddVmFromTemplate, param, new
UnitVmModelNetworkAsyncCallback(unitVmModel, defaultNetworkCreatingManager),
this);
- }
- };
-
AsyncDataProvider.getInstance().getTemplateDiskList(_asyncQuery,
gettempVm().getVmtGuid());
- }
- else
- {
- VM vm = gettempVm();
-
vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(model.getTemplate().getSelectedItem().getTemplateVersionName()));
-
- VmManagementParametersBase param = new
VmManagementParametersBase(vm);
-
param.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap());
- param.setMakeCreatorExplicitOwner(true);
-
param.setCopyTemplatePermissions(model.getCopyPermissions().getEntity());
-
-
param.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity());
-
param.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity());
- setRngDeviceToParams(model, param);
- Frontend.getInstance().runAction(VdcActionType.AddVm,
param, new UnitVmModelNetworkAsyncCallback(model,
defaultNetworkCreatingManager), this);
- }
+
param.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity());
+
param.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity());
+ setRngDeviceToParams(model, param);
+ Frontend.getInstance().runAction(VdcActionType.AddVm, param,
new UnitVmModelNetworkAsyncCallback(model, defaultNetworkCreatingManager),
this);
}
}
else
--
To view, visit http://gerrit.ovirt.org/33142
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd7f9cf4e6a9bcb2b336b34c785c09221068a915
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
