Moti Asayag has uploaded a new change for review. Change subject: engine: Extract network label check into a method ......................................................................
engine: Extract network label check into a method The network is recurrently being checked whether it is labeled. The same check is extracted into its own method. Change-Id: I9e2370e085dbfa6aa4a26c0eb1eaecc2096981ff Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetNetworkLabelsByNetworkIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java 8 files changed, 21 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/23192/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java index 5d581f0..18023df 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java @@ -417,7 +417,7 @@ private Map<String, List<Network>> getClusterNetworksByLabel(List<Network> clusterNetworks) { Map<String, List<Network>> networksByLabel = new HashMap<>(); for (Network network : clusterNetworks) { - if (network.getLabel() != null) { + if (NetworkUtils.isLabeled(network)) { if (!networksByLabel.containsKey(network.getLabel())) { networksByLabel.put(network.getLabel(), new ArrayList<Network>()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java index d10ef44..eaee236 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommand.java @@ -85,7 +85,7 @@ } }); - if (!getPersistedNetwork().isExternal() && getPersistedNetwork().getLabel() != null + if (!getPersistedNetwork().isExternal() && NetworkUtils.isLabeled(getPersistedNetwork()) && NetworkHelper.setupNetworkSupported(getVdsGroup().getcompatibility_version())) { addNetworkToHosts(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java index e40e702..897ee826 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkToVdsGroupCommand.java @@ -22,6 +22,7 @@ import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -45,7 +46,7 @@ } }); - if (!getPersistedNetwork().isExternal() && getPersistedNetwork().getLabel() != null + if (!getPersistedNetwork().isExternal() && NetworkUtils.isLabeled(getPersistedNetwork()) && NetworkHelper.setupNetworkSupported(getVdsGroup().getcompatibility_version())) { removeNetworkFromHosts(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetNetworkLabelsByNetworkIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetNetworkLabelsByNetworkIdQuery.java index b655c58..5d35e19 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetNetworkLabelsByNetworkIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetNetworkLabelsByNetworkIdQuery.java @@ -8,6 +8,7 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.pseudo.NetworkLabel; import org.ovirt.engine.core.common.queries.IdQueryParameters; +import org.ovirt.engine.core.utils.NetworkUtils; public class GetNetworkLabelsByNetworkIdQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetNetworkLabelsByNetworkIdQuery(P parameters) { @@ -18,7 +19,7 @@ protected void executeQueryCommand() { Network network = getDbFacade().getNetworkDao().get(getParameters().getId(), getUserID(), getParameters().isFiltered()); - getQueryReturnValue().setReturnValue(network == null || network.getLabel() == null + getQueryReturnValue().setReturnValue(network == null || !NetworkUtils.isLabeled(network) ? Collections.<NetworkLabel> emptyList() : new ArrayList<NetworkLabel>(Arrays.asList((new NetworkLabel(network.getLabel()))))); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 09f5aec..63a06b7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -294,11 +294,11 @@ } private boolean labelAdded() { - return getOldNetwork().getLabel() == null && getNetwork().getLabel() != null; + return !NetworkUtils.isLabeled(getOldNetwork()) && NetworkUtils.isLabeled(getNetwork()); } private boolean labelRemoved() { - return getOldNetwork().getLabel() != null && getNetwork().getLabel() == null; + return NetworkUtils.isLabeled(getOldNetwork()) && !NetworkUtils.isLabeled(getNetwork()); } private class SyncNetworkParametersBuilder extends NetworkParametersBuilder{ diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java index ee8b5de..44ec07b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java @@ -84,7 +84,7 @@ NetworkForCreate networkForCreate = new NetworkForCreate(); networkForCreate.setAdminStateUp(true); networkForCreate.setName(network.getName()); - if (network.getLabel() != null) { + if (NetworkUtils.isLabeled(network)) { networkForCreate.setProviderPhysicalNetwork(network.getLabel()); if (NetworkUtils.isVlan(network)) { networkForCreate.setProviderNetworkType(VLAN_NETWORK); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java index 39edb4b..b94edae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java @@ -190,7 +190,7 @@ } public ValidationResult notLabeled() { - return network.getLabel() == null ? ValidationResult.VALID + return !NetworkUtils.isLabeled(network) ? ValidationResult.VALID : new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_ALREADY_LABELED); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java index 42cd12a..827b5a8 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java @@ -241,6 +241,17 @@ } /** + * Determine if a given network is labeled + * + * @param network + * the network to check. + * @return <code>true</code> iff the network is labeled. + */ + public static boolean isLabeled(Network network) { + return network.getLabel() != null; + } + + /** * Constructs the vlan device name in the format of "{nic name}.{vlan-id}" * * @param underlyingNic -- To view, visit http://gerrit.ovirt.org/23192 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e2370e085dbfa6aa4a26c0eb1eaecc2096981ff 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
