Mike Kolesnik has uploaded a new change for review. Change subject: core: Add network business entities (#851991) ......................................................................
core: Add network business entities (#851991) https://bugzilla.redhat.com/851991 Currently they will be used to better distinguish the logs, in the future they will be more extensively used. Change-Id: Id5d94f30c3d6a196744736f44a7d6e20c86e2e37 Signed-off-by: Mike Kolesnik <[email protected]> --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml 4 files changed, 162 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/7871/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java new file mode 100644 index 0000000..b1470ad --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java @@ -0,0 +1,55 @@ +package org.ovirt.engine.core.common.businessentities.network; + +import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; + +public class Bond extends VdsNetworkInterface { + + private static final long serialVersionUID = 268337006285648461L; + + public Bond() { + } + + public Bond(String macAddress, String bondOptions, Integer bondType) { + setMacAddress(macAddress); + setBonded(true); + setBondOptions(bondOptions); + setBondType(bondType); + } + + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append(getName()) + .append(" {id=") + .append(getId()) + .append(", vdsId=") + .append(getVdsId()) + .append(", name=") + .append(getName()) + .append(", macAddress=") + .append(getMacAddress()) + .append(", networkName=") + .append(getNetworkName()) + .append(", bondOptions=") + .append(getBondOptions()) + .append(", bootProtocol=") + .append(getBootProtocol()) + .append(", address=") + .append(getAddress()) + .append(", subnet=") + .append(getSubnet()) + .append(", gateway=") + .append(getGateway()) + .append(", mtu=") + .append(getMtu()) + .append(", bridged=") + .append(isBridged()) + .append(", type=") + .append(getType()) + .append(", networkImplementationDetails=") + .append(getNetworkImplementationDetails()) + .append("]"); + return builder.toString(); + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java new file mode 100644 index 0000000..40b2fa4 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java @@ -0,0 +1,55 @@ +package org.ovirt.engine.core.common.businessentities.network; + +import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; + +public class Nic extends VdsNetworkInterface { + + private static final long serialVersionUID = 1674504258368214225L; + + public Nic() { + } + + public Nic(String macAddress, Integer speed, String bondName) { + setMacAddress(macAddress); + setSpeed(speed); + setBondName(bondName); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append(getName()) + .append(" {id=") + .append(getId()) + .append(", vdsId=") + .append(getVdsId()) + .append(", name=") + .append(getName()) + .append(", macAddress=") + .append(getMacAddress()) + .append(", networkName=") + .append(getNetworkName()) + .append(", bondName=") + .append(getBondName()) + .append(", bootProtocol=") + .append(getBootProtocol()) + .append(", address=") + .append(getAddress()) + .append(", subnet=") + .append(getSubnet()) + .append(", gateway=") + .append(getGateway()) + .append(", mtu=") + .append(getMtu()) + .append(", bridged=") + .append(isBridged()) + .append(", speed=") + .append(getSpeed()) + .append(", type=") + .append(getType()) + .append(", networkImplementationDetails=") + .append(getNetworkImplementationDetails()) + .append("]"); + return builder.toString(); + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java new file mode 100644 index 0000000..01308d9 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java @@ -0,0 +1,49 @@ +package org.ovirt.engine.core.common.businessentities.network; + +import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; + +public class Vlan extends VdsNetworkInterface { + + private static final long serialVersionUID = -2458958954004227402L; + + public Vlan() { + } + + public Vlan(int vlanId) { + setVlanId(vlanId); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append(getName()) + .append(" {id=") + .append(getId()) + .append(", vdsId=") + .append(getVdsId()) + .append(", name=") + .append(getName()) + .append(", networkName=") + .append(getNetworkName()) + .append(", vlanId=") + .append(getVlanId()) + .append(", bootProtocol=") + .append(getBootProtocol()) + .append(", address=") + .append(getAddress()) + .append(", subnet=") + .append(getSubnet()) + .append(", gateway=") + .append(getGateway()) + .append(", mtu=") + .append(getMtu()) + .append(", bridged=") + .append(isBridged()) + .append(", type=") + .append(getType()) + .append(", networkImplementationDetails=") + .append(getNetworkImplementationDetails()) + .append("]"); + return builder.toString(); + } +} diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml index 8d08e3b..30b09b7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml @@ -40,6 +40,9 @@ <include name="common/businessentities/NetworkInterface.java" /> <include name="common/businessentities/Nameable.java" /> <include name="common/businessentities/VdsNetworkInterface.java" /> + <include name="common/businessentities/network/Bond.java" /> + <include name="common/businessentities/network/Nic.java" /> + <include name="common/businessentities/network/Vlan.java" /> <include name="common/businessentities/VmNetworkInterface.java" /> <include name="common/businessentities/InterfaceStatus.java" /> <include name="common/businessentities/IrsStatus.java" /> -- To view, visit http://gerrit.ovirt.org/7871 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5d94f30c3d6a196744736f44a7d6e20c86e2e37 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
