Lior Vernia has uploaded a new change for review.
Change subject: core: VdsNetworkInterface to support empty properties map
......................................................................
core: VdsNetworkInterface to support empty properties map
Instead of implicitly assuming that custom properties are either null
or a meaningful collection, a method is added to check whether
meaningful properties exist, and the DAO is updated as well to not
trash the DB with empty collections.
Change-Id: Ie1cad7133800b4b8c2b7eb7e8be0be80a1e5cb9b
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoDbFacadeImpl.java
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/27116/1
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 e0ff540..7ab2f61 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
@@ -366,6 +366,10 @@
this.labels = labels;
}
+ public boolean hasCustomProperties() {
+ return customProperties != null && !customProperties.isEmpty();
+ }
+
public Map<String, String> getCustomProperties() {
return customProperties;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoDbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoDbFacadeImpl.java
index b0acb36..abdcbb5 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoDbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoDbFacadeImpl.java
@@ -129,7 +129,8 @@
.addValue("qos_overridden", nic.isQosOverridden())
.addValue("labels",
SerializationFactory.getSerializer().serialize(nic.getLabels()))
.addValue("custom_properties",
-
SerializationFactory.getSerializer().serialize(nic.getCustomProperties()));
+ SerializationFactory.getSerializer()
+ .serialize(nic.hasCustomProperties() ?
nic.getCustomProperties() : null));
}
private void persistQosChanges(VdsNetworkInterface entity) {
--
To view, visit http://gerrit.ovirt.org/27116
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1cad7133800b4b8c2b7eb7e8be0be80a1e5cb9b
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
