Mike Kolesnik has posted comments on this change.
Change subject: engine: Remove network from hosts when detached from cluster
......................................................................
Patch Set 5:
(4 comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
Line 32:
Line 33: for (VdsNetworkInterface nic : nics) {
Line 34: SetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(nic.getVdsId());
Line 35: VdsNetworkInterface nicToConfigure =
getNicToConfigure(setupNetworkParams.getInterfaces(), nic.getId());
Line 36: if (nicToConfigure == null) {
Not sure how this would occur when you're always sending only the NICs labled
by the label.
Line 37: continue;
Line 38: }
Line 39:
Line 40: if
(network.getName().equals(nicToConfigure.getNetworkName())) {
Line 63: private VdsNetworkInterface getVlanDevice(SetupNetworksParameters
setupNetworkParams,
Line 64: VdsNetworkInterface nicToConfigure) {
Line 65: VdsNetworkInterface vlan = null;
Line 66: for (VdsNetworkInterface n :
setupNetworkParams.getInterfaces()) {
Line 67: if (StringUtils.equals(n.getName(),
I would look for a device also by network name
Line 68:
NetworkUtils.getVlanDeviceName(nicToConfigure.getName(), network))) {
Line 69: vlan = n;
Line 70: }
Line 71: }
Line 65: VdsNetworkInterface vlan = null;
Line 66: for (VdsNetworkInterface n :
setupNetworkParams.getInterfaces()) {
Line 67: if (StringUtils.equals(n.getName(),
Line 68:
NetworkUtils.getVlanDeviceName(nicToConfigure.getName(), network))) {
Line 69: vlan = n;
You should just return it here as you're not expecting multiple devices..
Line 70: }
Line 71: }
Line 72:
Line 73: return vlan;
Line 86: AuditLogableBase logable = new AuditLogableBase();
Line 87: logable.setStoragePoolId(network.getDataCenterId());
Line 88: logable.addCustomValue("Network", network.getName());
Line 89: logable.addCustomValue("HostNames",
StringUtils.join(hostNames, ", "));
Line 90: AuditLogDirector.log(logable,
AuditLogType.REMOVE_NETWORK_BY_LABEL_FAILED);
Perhaps worthwhile to extract this to a common command to be used also by the
AddNetworkParametersBuilder since only the AuditLogType is different..
Line 91: }
Line 92:
Line 93: private VdsNetworkInterface
getNicToConfigure(List<VdsNetworkInterface> nics, Guid id) {
Line 94: for (VdsNetworkInterface nic : nics) {
--
To view, visit http://gerrit.ovirt.org/22771
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I513f5ce7332388ac44ddc1f05988f23d6531cb89
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <[email protected]>
Gerrit-Reviewer: Mike Kolesnik <[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
