Lior Vernia has posted comments on this change.
Change subject: engine: Support interface QoS override in Setup Networks
......................................................................
Patch Set 12:
(5 comments)
Patch on its way...
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java
Line 378: } else if (networkWasModified(iface)) {
Line 379: if
(networkIpAddressWasSameAsHostnameAndChanged(iface)) {
Line 380:
addViolation(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_ADDRESS_CANNOT_BE_CHANGED,
networkName);
Line 381: }
Line 382: modifiedNetworks.add(network);
Done
Line 383: }
Line 384: } else {
Line 385: VdsNetworkInterface existingIface =
getExistingIfaces().get(iface.getName());
Line 386: existingIface = (existingIface == null ? iface :
existingIface);
....................................................
File
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
Line 209: VDS vds = mock(VDS.class);
Line 210: when(vds.getId()).thenReturn(Guid.Empty);
Line 211:
Line 212: SetupNetworksHelper helper =
createHelper(createParametersForNics(nic), vds);
Line 213:
when(vds.getVdsGroupCompatibilityVersion()).thenReturn(Version.v3_2);
Because now createHelper() sets compatibility version, so to override it I need
to call this afterwards.
Line 214:
Line 215: validateAndExpectViolation(helper,
VdcBllMessages.NETWORK_ATTACH_ILLEGAL_GATEWAY, nic.getNetworkName());
Line 216: }
Line 217:
....................................................
File
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java
Line 187: VdsNetworkInterface vdsIface =
hostNicsByNames.get(dbIface.getName());
Line 188:
Line 189: // we preserve only the ID and the labels from the
Database
Line 190: // everything else is what we got from
getVdsCapabilities
Line 191: vdsIface.setId(dbIface.getId());
Done
Line 192: vdsIface.setLabels(dbIface.getLabels());
Line 193: dbIfacesToBatch.add(vdsIface);
Line 194: updatedIfaces.add(vdsIface.getName());
Line 195: } else {
....................................................
File
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java
Line 58: if (network.isVmNetwork()) {
Line 59: opts.put(VdsProperties.STP, network.getStp() ? "yes" :
"no");
Line 60: }
Line 61:
Line 62: if ((iface.isQosOverridden() ? iface.getQos() != null :
network.getQosId() != null)
Done
Line 63: &&
FeatureSupported.hostNetworkQos(getDbFacade().getVdsDao()
Line 64: .get(getParameters().getVdsId())
Line 65: .getVdsGroupCompatibilityVersion())) {
Line 66: NetworkQosMapper qosMapper =
....................................................
File
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java
Line 207: Network network = createNetwork(null);
Line 208: VdsNetworkInterface iface = createNic("eth0", null, null,
network.getName());
Line 209:
Line 210: NetworkQoS qos = createQos();
Line 211: when(qosDao.get(any(Guid.class))).thenReturn(qos);
Done
Line 212: iface.setQosOverridden(true);
Line 213:
Line 214: qos(network, iface, null, true);
Line 215: }
--
To view, visit http://gerrit.ovirt.org/22766
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I22a4fefac1c5e80c98a72507623152ea4d30ef07
Gerrit-PatchSet: 12
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <[email protected]>
Gerrit-Reviewer: Lior Vernia <[email protected]>
Gerrit-Reviewer: Mike Kolesnik <[email protected]>
Gerrit-Reviewer: Moti Asayag <[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
