Moti Asayag has uploaded a new change for review. Change subject: engine: Extract isVlan into NetworkUtils for reusability ......................................................................
engine: Extract isVlan into NetworkUtils for reusability Change-Id: I194bade26462fd91dc1b7a9585cbd2774f11af75 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/22728/1 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 7e889f4..75f1788 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 @@ -204,4 +204,15 @@ public static boolean isManagementNetwork(String networkName) { return getEngineNetwork().equals(networkName); } + + /** + * Determine if a given network is configured as a vlan + * + * @param network + * the network to check. + * @return <code>true</code> iff the network is a vlan. + */ + public static boolean isVlan(Network network) { + return network.getVlanId() != null; + } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java index b37de8e..a26eb9f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommand.java @@ -39,7 +39,7 @@ Boolean bonded = findInterfaceByName(ifaceNameWithoutVlan).getBonded(); String type = (bonded != null && bonded) ? "bonding" : "nic"; opts.put(type, ifaceNameWithoutVlan); - if (isVlan(network)) { + if (NetworkUtils.isVlan(network)) { opts.put("vlan", network.getVlanId().toString()); } @@ -79,10 +79,6 @@ default: break; } - } - - private static boolean isVlan(Network net) { - return net.getVlanId() != null; } private Map<String, Object> generateBonds() { -- To view, visit http://gerrit.ovirt.org/22728 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I194bade26462fd91dc1b7a9585cbd2774f11af75 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
