Moti Asayag has uploaded a new change for review. Change subject: engine: Use VmNic within UpdateVmCommand ......................................................................
engine: Use VmNic within UpdateVmCommand Replaces usages of VmNetworkInterface with VmNic where possible. Change-Id: Id8f84060667f97c613ea7ee2da65bb17478c52aa Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java 1 file changed, 11 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/17272/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index bfb05ba..856c9ea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -7,7 +7,9 @@ import java.util.Map; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.bll.network.cluster.NetworkHelper; import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter; import org.ovirt.engine.core.bll.quota.QuotaSanityParameter; import org.ovirt.engine.core.bll.quota.QuotaVdsDependent; @@ -30,7 +32,6 @@ import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.VmWatchdog; import org.ovirt.engine.core.common.businessentities.network.Network; -import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VmNic; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.locks.LockingGroup; @@ -160,23 +161,20 @@ private void UpdateVmNetworks() { // check if the cluster has changed if (!getVm().getVdsGroupId().equals(getParameters().getVmStaticData().getVdsGroupId())) { - List<Network> networks = DbFacade - .getInstance() - .getNetworkDao() - .getAllForCluster( - getParameters().getVmStaticData().getVdsGroupId()); - List<VmNetworkInterface> interfaces = DbFacade.getInstance() - .getVmNetworkInterfaceDao() - .getAllForVm(getParameters().getVmStaticData().getId()); - for (final VmNetworkInterface iface : interfaces) { + List<Network> networks = + getNetworkDAO().getAllForCluster(getParameters().getVmStaticData().getVdsGroupId()); + List<VmNic> interfaces = getVmNicDao().getAllForVm(getParameters().getVmStaticData().getId()); + + for (final VmNic iface : interfaces) { Network net = LinqUtils.firstOrNull(networks, new Predicate<Network>() { @Override public boolean eval(Network n) { - return n.getName().equals(iface.getNetworkName()); + Network network = NetworkHelper.getNetworkByVnicProfileId(iface.getVnicProfileId()); + return ObjectUtils.equals(n.getId(), network.getId()); } }); - // if network not exists in cluster we remove the network to - // interface connection + + // if network not exists in cluster we remove the network from the interface if (net == null) { iface.setVnicProfileId(null); getVmNicDao().update(iface); -- To view, visit http://gerrit.ovirt.org/17272 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8f84060667f97c613ea7ee2da65bb17478c52aa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
