Mike Kolesnik has uploaded a new change for review. Change subject: core: Add toString to params & entities (#851991) ......................................................................
core: Add toString to params & entities (#851991) https://bugzilla.redhat.com/851991 Added toString for logging networking VDSM command invocations, for ease of debugging. Change-Id: I825db07b7320c4768a38d89fd83177774e22a9fd Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkClusterId.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network_cluster.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugUnplgNicVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java 8 files changed, 160 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/7873/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java index 31c2ad1..7d55f4f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java @@ -217,6 +217,36 @@ } @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append(getName()) + .append(" {id=") + .append(getId()) + .append(", description=") + .append(getdescription()) + .append(", subnet=") + .append(getsubnet()) + .append(", gateway=") + .append(getgateway()) + .append(", type=") + .append(gettype()) + .append(", vlan_id=") + .append(getvlan_id()) + .append(", stp=") + .append(getstp()) + .append(", storage_pool_id=") + .append(getstorage_pool_id()) + .append(", mtu=") + .append(getMtu()) + .append(", vmNetwork=") + .append(isVmNetwork()) + .append(", cluster=") + .append(getCluster()) + .append("}"); + return builder.toString(); + } + + @Override public int hashCode() { final int prime = 31; int result = 1; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkClusterId.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkClusterId.java index 1965237..2aba4aa 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkClusterId.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NetworkClusterId.java @@ -77,11 +77,11 @@ @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("NetworkClusterId [clusterId=") + builder.append("{clusterId=") .append(getClusterId()) .append(", networkId=") .append(getNetworkId()) - .append("]"); + .append("}"); return builder.toString(); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java index a7444ee..de798f6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java @@ -307,6 +307,48 @@ } @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append(getName()) + .append(" {id=") + .append(getId()) + .append(", vdsId=") + .append(getVdsId()) + .append(", macAddress=") + .append(getMacAddress()) + .append(", networkName=") + .append(getNetworkName()) + .append(", vlanId=") + .append(getVlanId()) + .append(", bonded=") + .append(getBonded()) + .append(", bondName=") + .append(getBondName()) + .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(", speed=") + .append(getSpeed()) + .append(", type=") + .append(getType()) + .append(", networkImplementationDetails=") + .append(getNetworkImplementationDetails()) + .append("}"); + return builder.toString(); + } + + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); @@ -443,5 +485,16 @@ public boolean isManaged() { return managed; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("{inSync=") + .append(isInSync()) + .append(", managed=") + .append(isManaged()) + .append("}"); + return builder.toString(); + } } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java index 28eb699..5f2b877 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java @@ -140,6 +140,35 @@ } @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("VmNetworkInterface [id=") + .append(getId()) + .append(", networkName=") + .append(getNetworkName()) + .append(", speed=") + .append(getSpeed()) + .append(", type=") + .append(getType()) + .append(", name=") + .append(getName()) + .append(", macAddress=") + .append(getMacAddress()) + .append(", active=") + .append(isActive()) + .append(", portMirroring=") + .append(isPortMirroring()) + .append(", vmId=") + .append(getVmId()) + .append(", vmName=") + .append(getVmName()) + .append(", vmTemplateId=") + .append(getVmTemplateId()) + .append("]"); + return builder.toString(); + } + + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network_cluster.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network_cluster.java index ef417e7..c6fbfc6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network_cluster.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network_cluster.java @@ -36,6 +36,21 @@ } @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("network_cluster {id=") + .append(getId()) + .append(", status=") + .append(getstatus()) + .append(", is_display=") + .append(getis_display()) + .append(", required=") + .append(isRequired()) + .append("}"); + return builder.toString(); + } + + @Override public int hashCode() { final int prime = 31; int result = 1; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugUnplgNicVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugUnplgNicVDSParameters.java index 34864f9..88df47b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugUnplgNicVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugUnplgNicVDSParameters.java @@ -29,4 +29,13 @@ public VmDevice getVmDevice() { return vmDevice; } + + @Override + public String toString() { + return String.format("%s, vm.vm_name=%s, nic=%s, vmDevice=%s", + super.toString(), + (getVm() == null ? "" : getVm().getvm_name()), + getNic(), + getVmDevice()); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java index a1026f9..816711a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java @@ -2,8 +2,8 @@ import java.util.Arrays; -import org.ovirt.engine.core.common.businessentities.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.Network; +import org.ovirt.engine.core.common.businessentities.NetworkBootProtocol; import org.ovirt.engine.core.compat.Guid; public class NetworkVdsmVDSCommandParameters extends VdsIdVDSCommandParametersBase { @@ -207,9 +207,9 @@ @Override public String toString() { - return String.format("%s, networkName=%s, oldNetworkName=%s, hostAddr=%s, checkConnectivity=%s, " + - "connectionTimeout=%s, vlanId=%s, bondName=%s, nics=%s, inetAddr=%s, networkMask=%s, gateway=%s, " + - "stp=%s, bondingOptions=%s, bootProtocol=%s, vmNetwork=%s", + return String.format("%s, networkName=%s, oldNetworkName=%s, hostAddr=%s, checkConnectivity=%s, " + + "connectionTimeout=%s, vlanId=%s, bondName=%s, nics=%s, inetAddr=%s, networkMask=%s, gateway=%s, " + + "stp=%s, bondingOptions=%s, bootProtocol=%s, vmNetwork=%s, network=%s", super.toString(), getNetworkName(), getOldNetworkName(), @@ -225,6 +225,7 @@ getStp(), getBondingOptions(), getBootProtocol(), - isVmNetwork()); + isVmNetwork(), + getNetwork()); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java index 8900947..1830fb2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java @@ -5,8 +5,9 @@ import java.util.List; import java.util.Set; -import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; +import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.Network; +import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; import org.ovirt.engine.core.compat.Guid; public class SetupNetworksVdsCommandParameters extends VdsIdVDSCommandParametersBase { @@ -109,4 +110,18 @@ public void setRemovedBonds(Set<String> removedBonds) { this.removedBonds = removedBonds; } + + @Override + public String toString() { + return String.format("%s, force=%s, checkConnectivity=%s, conectivityTimeout=%s,\n\tnetworks=%s,\n\tbonds=%s,\n\tinterfaces=%s,\n\tremovedNetworks=%s,\n\tremovedBonds=%s", + super.toString(), + isForce(), + isCheckConnectivity(), + getConectivityTimeout(), + Entities.collectionToString(getNetworks(), "\t\t"), + Entities.collectionToString(getBonds(), "\t\t"), + Entities.collectionToString(getInterfaces(), "\t\t"), + getRemovedNetworks(), + getRemovedBonds()); + } } -- To view, visit http://gerrit.ovirt.org/7873 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I825db07b7320c4768a38d89fd83177774e22a9fd 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
