Arik Hadas has uploaded a new change for review.
Change subject: userportal: cleanup - extract method
......................................................................
userportal: cleanup - extract method
Extract the code that adds new VM to separate method:
UserPortalListModel#saveNewVm.
Change-Id: Ia28f695d93d0e26858b140e172fe5b4267b5bbf7
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, 36 insertions(+), 32 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/33147/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 a47e478..a575fd2 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
@@ -1089,38 +1089,7 @@
if (model.getIsNew())
{
- setstorageDomain(model.getStorageDomain().getSelectedItem());
-
- if (model.getProvisioning().getEntity())
- {
- 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.AddVmFromTemplate, param, new
UnitVmModelNetworkAsyncCallback(unitVmModel, defaultNetworkCreatingManager),
this);
- }
- 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);
- }
+ saveNewVm(model);
}
else
{
@@ -1161,6 +1130,41 @@
}
}
+ private void saveNewVm(final UnitVmModel model) {
+ setstorageDomain(model.getStorageDomain().getSelectedItem());
+
+ if (model.getProvisioning().getEntity())
+ {
+ 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.AddVmFromTemplate,
param, new UnitVmModelNetworkAsyncCallback(unitVmModel,
defaultNetworkCreatingManager), this);
+ }
+ 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);
+ }
+ }
+
private void updateExistingVm(UserPortalListModel userPortalListModel,
final boolean applyCpuChangesLater) {
final UnitVmModel model = (UnitVmModel) getWindow();
UserPortalItemModel selectedItem = (UserPortalItemModel)
userPortalListModel.getSelectedItem();
--
To view, visit http://gerrit.ovirt.org/33147
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia28f695d93d0e26858b140e172fe5b4267b5bbf7
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
