Gilad Chaplik has posted comments on this change.
Change subject: core,frontend: show template name also for cloned VMs
......................................................................
Patch Set 5: Code-Review+1
(10 comments)
+1 for FE, minor comments for BE.
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
Line 733: vmStatic.setUserDefinedProperties(userDefinedProperties);
Line 734: }
Line 735:
Line 736: vmStatic.setOriginalTemplateGuid(vmStatic.getVmtGuid());
Line 737: VmTemplate template =
getVmTemplateDAO().get(vmStatic.getVmtGuid());
we can save a DAO fetch if vmt id equals to empty guid..
Line 738: vmStatic.setOriginalTemplateName(template.getName());
Line 739: getVmStaticDao().save(vmStatic);
Line 740: getCompensationContext().snapshotNewEntity(vmStatic);
Line 741: }
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
Line 963:
getVm().getStaticData().setVdsGroupId(getParameters().getVdsGroupId());
Line 964:
getVm().getStaticData().setMinAllocatedMem(computeMinAllocatedMem());
Line 965:
getVm().getStaticData().setQuotaId(getParameters().getQuotaId());
Line 966:
Line 967: VmTemplate originalTemplate =
DbFacade.getInstance().getVmTemplateDao().get(getVm().getOriginalTemplateGuid());
I think that you should also check nullity before the dao call, and also check
whether the guid is empty (same reason as previous comment).
Line 968: if (originalTemplate != null) {
Line 969: // in case the original template name has been changed in
the meantime
Line 970:
getVm().getStaticData().setOriginalTemplateName(originalTemplate.getName());
Line 971: }
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
Line 277:
Line 278: private void updateOriginalTemplateNameOnDerivedVms() {
Line 279: if (!getParameters().isImportAsNewEntity()) {
Line 280: // in case it has been renamed
Line 281:
DbFacade.getInstance().getVmDao().updateOriginalTemplateName(getVmTemplate().getId(),
getVmTemplate().getName());
I remember that we can't change names when we're not cloning.
btw, it's interesting what should we do for clone...
Line 282: }
Line 283: }
Line 284:
Line 285: private void checkTrustedService() {
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
Line 24: import org.ovirt.engine.core.common.queries.IdQueryParameters;
Line 25: import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
Line 26: import org.ovirt.engine.core.common.queries.VdcQueryType;
Line 27: import org.ovirt.engine.core.common.errors.VdcBllMessages;
Line 28: import org.ovirt.engine.core.common.utils.ObjectUtils;
try org.apache.commons.lang :)
Line 29: import org.ovirt.engine.core.common.utils.Pair;
Line 30: import org.ovirt.engine.core.common.validation.group.UpdateEntity;
Line 31: import org.ovirt.engine.core.compat.Guid;
Line 32: import org.ovirt.engine.core.dal.dbbroker.DbFacade;
Line 171:
Line 172: private void updateOriginalTemplateNameOnDerivedVms() {
Line 173: boolean templateNameChanged =
!ObjectUtils.objectsEqual(mOldTemplate.getName(), getVmTemplate().getName());
Line 174: if (templateNameChanged) {
Line 175:
DbFacade.getInstance().getVmDao().updateOriginalTemplateName(getVmTemplate().getId(),
getVmTemplate().getName());
you have the get***Dao in base class.. (in all other places as well)
Line 176: }
Line 177: }
Line 178:
Line 179: private void UpdateVmTemplate() {
....................................................
File
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java
Line 384: entity.setCpuName(rs.getString("cpu_name"));
Line 385:
entity.setInstanceTypeId(Guid.createGuidFromString(rs.getString("instance_type_id")));
Line 386:
entity.setImageTypeId(Guid.createGuidFromString(rs.getString("image_type_id")));
Line 387:
entity.setOriginalTemplateName(rs.getString("original_template_name"));
Line 388:
entity.setOriginalTemplateGuid(Guid.createGuidFromString(rs.getString("original_template_id")));
use getGuid
Line 389: return entity;
Line 390: }
Line 391: }
Line 392:
....................................................
File
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java
Line 225:
entity.setVncKeyboardLayout(rs.getString("vnc_keyboard_layout"));
Line 226:
entity.setInstanceTypeId(Guid.createGuidFromString(rs.getString("instance_type_id")));
Line 227:
entity.setImageTypeId(Guid.createGuidFromString(rs.getString("image_type_id")));
Line 228:
entity.setOriginalTemplateName(rs.getString("original_template_name"));
Line 229:
entity.setOriginalTemplateGuid(Guid.createGuidFromString(rs.getString("original_template_id")));
same
Line 230:
Line 231: return entity;
Line 232: }
Line 233: }
....................................................
File backend/manager/modules/dal/src/test/resources/fixtures.xml
Line 1464: <column>quota_id</column>
Line 1465: <column>db_generation</column>
Line 1466: <column>tunnel_migration</column>
Line 1467: <column>min_allocated_mem</column>
Line 1468: <column>is_run_and_pause</column>
remove tabs
Line 1469: <column>created_by_user_id</column>
Line 1470: <column>instance_type_id</column>
Line 1471: <column>image_type_id</column>
Line 1472: <column>original_template_id</column>
....................................................
File
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
Line 221: if (node != null) {
Line 222:
_vm.setTrustedService(Boolean.parseBoolean(node.InnerText));
Line 223: }
Line 224:
Line 225: node = content.SelectSingleNode("OriginalTemplateGuid");
naming: i'd use "OriginalTemplateId" instead of "OriginalTemplateGuid".
Line 226: if (node != null) {
Line 227: _vm.getStaticData().setOriginalTemplateGuid(new
Guid(node.InnerText));
Line 228: }
Line 229:
....................................................
File
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
Line 74: _writer.WriteRaw(String.valueOf(_vm.isTrustedService()));
Line 75: _writer.WriteEndElement();
Line 76:
Line 77: if (_vm.getStaticData().getOriginalTemplateGuid() != null) {
Line 78: _writer.WriteStartElement("OriginalTemplateGuid");
same
Line 79:
_writer.WriteRaw(_vm.getStaticData().getOriginalTemplateGuid().toString());
Line 80: _writer.WriteEndElement();
Line 81: }
Line 82:
--
To view, visit http://gerrit.ovirt.org/21047
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ieea4ad7c1ed845d3ff57aaafc19f0830ab72b2d1
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <[email protected]>
Gerrit-Reviewer: Daniel Erez <[email protected]>
Gerrit-Reviewer: Eli Mesika <[email protected]>
Gerrit-Reviewer: Gilad Chaplik <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Tomas Jelinek <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
