Lior Vernia has uploaded a new change for review.
Change subject: core: Remove code duplication in VdsNetworkInterface.toString()
......................................................................
core: Remove code duplication in VdsNetworkInterface.toString()
Changed the serialization of VdsNetworkInterface to re-use code
instead of duplicate it. New serialized attributes were being added
only to VdsNetworkInterface by unsuspecting developers, yet these
would not show in the engine log, for example on Setup Networks
commands, as the base class method was being overridden by subclasses
(where the new attributes weren't being added).
Change-Id: I94bbf7113e848f6ca8ae4a38e46303050d653135
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java
4 files changed, 17 insertions(+), 100 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/36215/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
index 8fa92e1..62e1f79 100644
---
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
@@ -31,38 +31,14 @@
}
@Override
- public String toString() {
+ protected String serializeAdditionalAttributes() {
StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" {id=")
- .append(getId())
- .append(", vdsId=")
- .append(getVdsId())
- .append(", name=")
- .append(getName())
- .append(", macAddress=")
+ builder.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("}");
+ .append(", labels=")
+ .append(getLabels());
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
index a3f76b9..731812f 100644
---
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
@@ -15,40 +15,16 @@
}
@Override
- public String toString() {
+ protected String serializeAdditionalAttributes() {
StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" {id=")
- .append(getId())
- .append(", vdsId=")
- .append(getVdsId())
- .append(", name=")
- .append(getName())
- .append(", macAddress=")
+ builder.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("}");
+ .append(", labels=")
+ .append(getLabels());
return builder.toString();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
index adb603b..b72829d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
@@ -426,6 +426,10 @@
setCustomProperties(sourceNic.getCustomProperties());
}
+ protected String serializeAdditionalAttributes() {
+ return "";
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
@@ -434,20 +438,9 @@
.append(getId())
.append(", vdsId=")
.append(getVdsId())
- .append(", macAddress=")
- .append(getMacAddress())
.append(", networkName=")
.append(getNetworkName())
- .append(", baseInterface=")
- .append(getBaseInterface())
- .append(", vlanId=")
- .append(getVlanId())
- .append(", bonded=")
- .append(getBonded())
- .append(", bondName=")
- .append(getBondName())
- .append(", bondOptions=")
- .append(getBondOptions())
+ .append(serializeAdditionalAttributes())
.append(", bootProtocol=")
.append(getBootProtocol())
.append(", address=")
@@ -460,8 +453,6 @@
.append(getMtu())
.append(", bridged=")
.append(isBridged())
- .append(", speed=")
- .append(getSpeed())
.append(", type=")
.append(getType())
.append(", networkImplementationDetails=")
@@ -470,8 +461,6 @@
.append(getQos())
.append(" qosOverridden=")
.append(isQosOverridden())
- .append(", labels=")
- .append(getLabels())
.append(", customProperties=")
.append(getCustomProperties())
.append("}");
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
index 255ea5f..641c602 100644
---
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
@@ -15,36 +15,12 @@
}
@Override
- public String toString() {
+ protected String serializeAdditionalAttributes() {
StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" {id=")
- .append(getId())
- .append(", vdsId=")
- .append(getVdsId())
- .append(", name=")
- .append(getName())
- .append(", networkName=")
- .append(getNetworkName())
+ builder.append(", baseInterface=")
+ .append(getBaseInterface())
.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("}");
+ .append(getVlanId());
return builder.toString();
}
}
--
To view, visit http://gerrit.ovirt.org/36215
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94bbf7113e848f6ca8ae4a38e46303050d653135
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lver...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
