Muli Salem has posted comments on this change.
Change subject: core: Remove Network Name in Import (#844396)
......................................................................
Patch Set 4: (5 inline comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
Line 363: iStat.setId(iface.getId());
Line 364: iStat.setVmId(getVmTemplateId());
Line 365: iDynamic.setVmTemplateId(getVmTemplateId());
Line 366: iDynamic.setName(iface.getName());
Line 367: if (vmInterfaceManager.isValidVmNetwork(iface,
networksInVdsByName)) {
I prefer it to be non-static, the rest of the class works that way and this
allows consistency.
Line 368: iDynamic.setNetworkName(networkName);
Line 369: } else {
Line 370: invalidNetworkNames.add(iface.getNetworkName());
Line 371: invalidIfaceNames.add(iface.getName());
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
Line 373: }
Line 374: }
Line 375:
Line 376: protected AuditLogType getAuditLogTypeForInvalidInterfaces() {
Line 377: // Functionality should be implemented in subclasses
Done
Line 378: return AuditLogType.UNASSIGNED;
Line 379: }
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java
Line 81: * @param iface
Line 82: * @param networksByName
Line 83: * @return
Line 84: */
Line 85: public boolean isValidVmNetwork(VmNetworkInterface iface,
Map<String, Network> networksByName) {
Prefer it to be non-static.
Line 86: String networkName = iface.getNetworkName();
Line 87: return (networksByName.containsKey(networkName) &&
networksByName.get(networkName).isVmNetwork());
Line 88: }
Line 89:
....................................................
File
backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
Line 514: RELOAD_CONFIGURATIONS_SUCCESS=System Configurations reloaded
successfully.
Line 515: RELOAD_CONFIGURATIONS_FAILURE=System Configurations failed to reload.
Line 516: USER_ACCOUNT_DISABLED_OR_LOCKED=User ${UserName} cannot login, as it
got disabled or locked. Please contact the system administrator.
Line 517: USER_ACCOUNT_PASSWORD_EXPIRED=User ${UserName} cannot login, as the
user account password has expired. Please contact the system administrator.
Line 518: IMPORTEXPORT_IMPORT_VM_INVALID_INTERFACES=While importing VM
${VmName}, the Network/s ${Networks} were found to be Non-VM Networks or do not
exist in Cluster. Network Name was set to empty in the Interface/s
${Interfaces}.
Done
Line 519: IMPORTEXPORT_IMPORT_TEMPLATE_INVALID_INTERFACES=While importing
Template ${VmTemplateName}, the Network/s ${Networks} were found to be Non-VM
Networks or do not exist in Cluster. Network Name was set to empty in the
Interface/s ${Interfaces}.
Line 520: VDS_SET_NON_OPERATIONAL_VM_NETWORK_IS_BRIDGELESS=Host ${VdsName} does
not comply with the cluster ${VdsGroupName} networks, the following VM networks
are bridgeless: '${Networks}'
Line 521: # Gluster Messages
Line 522: GLUSTER_VOLUME_CREATE=Gluster Volume ${glusterVolumeName} created.
Line 515: RELOAD_CONFIGURATIONS_FAILURE=System Configurations failed to reload.
Line 516: USER_ACCOUNT_DISABLED_OR_LOCKED=User ${UserName} cannot login, as it
got disabled or locked. Please contact the system administrator.
Line 517: USER_ACCOUNT_PASSWORD_EXPIRED=User ${UserName} cannot login, as the
user account password has expired. Please contact the system administrator.
Line 518: IMPORTEXPORT_IMPORT_VM_INVALID_INTERFACES=While importing VM
${VmName}, the Network/s ${Networks} were found to be Non-VM Networks or do not
exist in Cluster. Network Name was set to empty in the Interface/s
${Interfaces}.
Line 519: IMPORTEXPORT_IMPORT_TEMPLATE_INVALID_INTERFACES=While importing
Template ${VmTemplateName}, the Network/s ${Networks} were found to be Non-VM
Networks or do not exist in Cluster. Network Name was set to empty in the
Interface/s ${Interfaces}.
Done
Line 520: VDS_SET_NON_OPERATIONAL_VM_NETWORK_IS_BRIDGELESS=Host ${VdsName} does
not comply with the cluster ${VdsGroupName} networks, the following VM networks
are bridgeless: '${Networks}'
Line 521: # Gluster Messages
Line 522: GLUSTER_VOLUME_CREATE=Gluster Volume ${glusterVolumeName} created.
Line 523: GLUSTER_VOLUME_CREATE_FAILED=Creation of Gluster Volume
${glusterVolumeName} failed.
--
To view, visit http://gerrit.ovirt.org/7326
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1c0e2258d1523c99ef095a3e07947835ff0c5da2
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Muli Salem <[email protected]>
Gerrit-Reviewer: Livnat Peer <[email protected]>
Gerrit-Reviewer: Mike Kolesnik <[email protected]>
Gerrit-Reviewer: Moti Asayag <[email protected]>
Gerrit-Reviewer: Muli Salem <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
