Yevgeny Zaspitsky has uploaded a new change for review. Change subject: webadmin: update Linq.NetworkComparator ......................................................................
webadmin: update Linq.NetworkComparator Update Linq.NetworkComparatora to use isManagement (if possible) instead of DefaultManagementNetwork config value. Change-Id: Ib6d3c01b552c6a8034652e533d2bae7319cbd9fb Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/37027/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index 36ffb1c..2d594d9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -58,7 +58,6 @@ import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterNetworkModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkQoSModel; -import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterfaceListModel; import org.ovirt.engine.ui.uicommonweb.models.providers.ExternalNetwork; import org.ovirt.engine.ui.uicommonweb.models.storage.LunModel; import org.ovirt.engine.ui.uicommonweb.models.storage.SanTargetModel; @@ -1314,9 +1313,9 @@ @Override public int compare(Network net1, Network net2) { // management first - if (net1.getName().equals(HostInterfaceListModel.ENGINE_NETWORK_NAME)) { + if (isManagementNetwork(net1)) { return -1; - } else if (net2.getName().equals(HostInterfaceListModel.ENGINE_NETWORK_NAME)) { + } else if (isManagementNetwork(net2)) { return 1; } @@ -1324,6 +1323,10 @@ } } + private static boolean isManagementNetwork(Network network) { + return network.getCluster() != null && network.getCluster().isManagement(); + } + public final static class VnicProfileViewComparator implements Comparator<VnicProfileView>, Serializable { private static final long serialVersionUID = 990203400356561587L; -- To view, visit http://gerrit.ovirt.org/37027 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6d3c01b552c6a8034652e533d2bae7319cbd9fb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
