Moti Asayag has uploaded a new change for review. Change subject: engine: Use VmNic within VmPoolHandler ......................................................................
engine: Use VmNic within VmPoolHandler Replaces usages of VmNetworkInterface with VmNic where possible. Change-Id: I721c6e60a97417c6f1cdbc43e46fd9c07572da85 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java 1 file changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/17273/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java index 7da3d91..559b463 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java @@ -4,6 +4,7 @@ import java.util.Map; import org.ovirt.engine.core.bll.context.CommandContext; +import org.ovirt.engine.core.bll.network.cluster.NetworkHelper; import org.ovirt.engine.core.bll.provider.ProviderProxyFactory; import org.ovirt.engine.core.bll.provider.network.NetworkProviderProxy; import org.ovirt.engine.core.bll.quota.QuotaManager; @@ -18,7 +19,7 @@ import org.ovirt.engine.core.common.businessentities.VmPoolType; import org.ovirt.engine.core.common.businessentities.VmStatic; 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.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.log.Log; @@ -61,19 +62,16 @@ } private static void handleProviderNetworks(Guid vmId) { - List<VmNetworkInterface> interfaces = DbFacade.getInstance().getVmNetworkInterfaceDao().getAllForVm(vmId); + List<VmNic> interfaces = DbFacade.getInstance().getVmNicDao().getAllForVm(vmId); VmStatic vm = DbFacade.getInstance().getVmStaticDao().get(vmId); Map<String, Network> clusterNetworks = Entities.entitiesByName(DbFacade.getInstance().getNetworkDao().getAllForCluster(vm.getVdsGroupId())); - for (VmNetworkInterface iface : interfaces) { - String networkName = iface.getNetworkName(); - - if (networkName != null - && clusterNetworks.get(networkName).isExternal()) { + for (VmNic iface : interfaces) { + Network network = NetworkHelper.getNetworkByVnicProfileId(iface.getVnicProfileId()); + if (network != null && network.isExternal() && clusterNetworks.containsKey(network.getName())) { NetworkProviderProxy providerProxy = ProviderProxyFactory.getInstance().create( - DbFacade.getInstance().getProviderDao().get( - clusterNetworks.get(networkName).getProvidedBy().getProviderId())); + DbFacade.getInstance().getProviderDao().get(network.getProvidedBy().getProviderId())); providerProxy.deallocate(iface); } } -- To view, visit http://gerrit.ovirt.org/17273 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I721c6e60a97417c6f1cdbc43e46fd9c07572da85 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
