Mike Kolesnik has posted comments on this change.
Change subject: core: add NetworkLinking support to RunVm command.
......................................................................
Patch Set 17: (5 inline comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
Line 775: */
Line 776: private boolean validateNetworkInterfaces() {
Line 777: Map<String, VmNetworkInterface> interfaceNetworkMap =
Entities.interfacesByNetworkName(getVm().getInterfaces());
Line 778: Set<String> interfaceNetworkNames =
interfaceNetworkMap.keySet();
Line 779: List<Network> clusterNetworks =
getNetworkDAO().getAllForCluster(getVm().getVdsGroupId());
This code should come after the condition you added, to avoid unnecessary query
for data in case it's not needed.
Line 780: Set<String> clusterNetworksNames =
Entities.objectNames(clusterNetworks);
Line 781:
Line 782: // Checking that the interfaces are all configured
Line 783: // If network linking is supported, interfaces with no
network are allowed.
Line 804: if (interfacesMap.containsKey(null)) {
Line 805: boolean networkLinkingSupported =
Line 806: Config.<Boolean>
GetValue(ConfigValues.NetworkLinkingSupported,
Line 807: getVm().getVdsGroupCompatibilityVersion().
Line 808: getValue());
I see no need to put this on a new line
Line 809:
Line 810: // If linking is not supported the interface must have a
network.
Line 811: if (!networkLinkingSupported) {
Line 812:
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_INTERFACE_NETWORK_NOT_CONFIGURED);
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
Line 448: private boolean networkRequiredOnVds(VmNetworkInterface vmIface,
Line 449: Map<String, Network> networksByName,
Line 450: boolean onlyRequiredNetworks) {
Line 451: boolean networkRequiredOnVds = true;
Line 452: if (!vmIface.isActive() || vmIface.getNetworkName() == null) {
How is this possible if you already checked if network name is null before?
Line 453: networkRequiredOnVds = false;
Line 454: } else if (onlyRequiredNetworks) {
Line 455: networkRequiredOnVds =
networksByName.get(vmIface.getNetworkName()).getCluster().isRequired();
Line 456: }
....................................................
File
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
Line 43: private final static String FIRST_MASTER_MODEL = "ich9-ehci1";
Line 44:
Line 45: private final List<XmlRpcStruct> devices = new
ArrayList<XmlRpcStruct>();
Line 46: private List<VmDevice> managedDevices = null;
Line 47: private final boolean hasNonDefaultBootOrder;
If you're already changing this line, you could convert it to local variable in
the ctor since it's not used anywhere else.
Line 48:
Line 49: public VmInfoBuilder(VM vm, XmlRpcStruct createInfo) {
Line 50: this.vm = vm;
Line 51: this.createInfo = createInfo;
Line 469: Version clusterVersion) {
Line 470: struct.add(VdsProperties.Type, vmDevice.getType());
Line 471: struct.add(VdsProperties.Device, vmDevice.getDevice());
Line 472:
Line 473: if (vmInterface.getNetworkName() != null) {
Could be inlined as:
struct.add(VdsProperties.network, vmInterface.getNetworkName() == null ? "" :
vmInterface.getNetworkName());
Line 474: struct.add(VdsProperties.network,
vmInterface.getNetworkName());
Line 475: } else {
Line 476: struct.add(VdsProperties.network, "");
Line 477: }
--
To view, visit http://gerrit.ovirt.org/9518
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib9805b18c364685a6533b89cfa31ae0575a00ea5
Gerrit-PatchSet: 17
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
Gerrit-Reviewer: Alona Kaplan <alkap...@redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegu...@redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkole...@redhat.com>
Gerrit-Reviewer: Moti Asayag <masa...@redhat.com>
Gerrit-Reviewer: Muli Salem <msa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
