Moti Asayag has uploaded a new change for review. Change subject: engine: Extract method to create the vlan name ......................................................................
engine: Extract method to create the vlan name A method to produce a vlan device name is being extract for the sake of reusability. Change-Id: Ic00417b54feb523d8152363ed0986ae9b685f36e Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java 2 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/22768/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java index 2a6355e..239813b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java @@ -78,7 +78,7 @@ VdsNetworkInterface vlan = new Vlan(); vlan.setNetworkName(network.getName()); vlan.setVdsId(hostId); - vlan.setName(underlyingNic + "." + network.getVlanId()); + vlan.setName(NetworkUtils.getVlanDeviceName(underlyingNic, network)); vlan.setBootProtocol(NetworkBootProtocol.NONE); return vlan; } 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 75f1788..2138e8e 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 @@ -215,4 +215,17 @@ public static boolean isVlan(Network network) { return network.getVlanId() != null; } + + /** + * Constructs the vlan device name in the format of "{nic name}.{vlan-id}" + * + * @param underlyingNic + * the device on top the vlan device is created + * @param network + * the network which holds the vlan-id + * @return a name representing the vlan device + */ + public static String getVlanDeviceName(String underlyingNic, Network network) { + return underlyingNic + "." + network.getVlanId(); + } } -- To view, visit http://gerrit.ovirt.org/22768 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic00417b54feb523d8152363ed0986ae9b685f36e 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
