Moti Asayag has uploaded a new change for review.
Change subject: engine: Fix coverity warnings (NULL_RETURNS)
......................................................................
engine: Fix coverity warnings (NULL_RETURNS)
Although the warned scenario is unlikely to occur,
it would be advisable to terminate network configuration
base on network labels if an external event (i.e. refresh
host capabilities) will cause an existing labeled nic to
disappear. This is a rare race, but can happen.
Change-Id: Iea07be387e71f0dfb8d9a78d8e03c504095c2062
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
7 files changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/22949/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 3ded7e2..e828d41 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
@@ -11,6 +11,8 @@
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
+import org.ovirt.engine.core.common.errors.VdcBLLException;
+import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
@@ -33,6 +35,9 @@
for (VdsNetworkInterface nic : nics) {
SetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(nic.getVdsId());
VdsNetworkInterface nicToConfigure =
getNicToConfigure(setupNetworkParams.getInterfaces(), nic.getId());
+ if (nicToConfigure == null) {
+ throw new
VdcBLLException(VdcBllErrors.LABELED_NETWORK_INTERFACE_NOT_FOUND);
+ }
if (vlanNetwork) {
VdsNetworkInterface vlan = createVlanDevice(nic, network);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
index d97a209..267db0f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java
@@ -11,6 +11,8 @@
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
+import org.ovirt.engine.core.common.errors.VdcBLLException;
+import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
@@ -33,6 +35,9 @@
for (VdsNetworkInterface nic : nics) {
SetupNetworksParameters setupNetworkParams =
createSetupNetworksParameters(nic.getVdsId());
VdsNetworkInterface nicToConfigure =
getNicToConfigure(setupNetworkParams.getInterfaces(), nic.getId());
+ if (nicToConfigure == null) {
+ throw new
VdcBLLException(VdcBllErrors.LABELED_NETWORK_INTERFACE_NOT_FOUND);
+ }
if (network.getName().equals(nicToConfigure.getNetworkName())) {
nicToConfigure.setNetworkName(null);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
index 131b728..31718ad 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
@@ -429,6 +429,7 @@
// Network Labels
NETWORK_LABEL_CONFLICT(5070),
+ LABELED_NETWORK_INTERFACE_NOT_FOUND(5071),
// Gluster errors
NO_UP_SERVER_FOUND(7000),
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index 434bc77..469ef7a 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -1096,3 +1096,4 @@
VAR__FILTERTYPE__INTERNAL=$filterType internal
POWER_MANAGEMENT_ACTION_ON_ENTITY_ALREADY_IN_PROGRESS=Cannot perform
${action}. Another power management action is already in progress.
NETWORK_LABEL_CONFLICT=The networks represented by label cannot be configured
on the same network interface.
+LABELED_NETWORK_INTERFACE_NOT_FOUND=A labeled network interface could not be
found.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index 64abb2c..b074f4a 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -2918,4 +2918,7 @@
@DefaultStringValue("The networks represented by label cannot be
configured on the same network interface.")
String NETWORK_LABEL_CONFLICT();
+
+ @DefaultStringValue("A labeled network interface could not be found.")
+ String LABELED_NETWORK_INTERFACE_NOT_FOUND();
}
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index fb6921f..250de41 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -949,3 +949,4 @@
VAR__FILTERTYPE__INTERNAL=$filterType internal
POWER_MANAGEMENT_ACTION_ON_ENTITY_ALREADY_IN_PROGRESS=Cannot perform
${action}. Another power management action is already in progress.
NETWORK_LABEL_CONFLICT=The networks represented by label cannot be configured
on the same network interface.
+LABELED_NETWORK_INTERFACE_NOT_FOUND=A labeled network interface could not be
found.
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index f7fa226..61d7913 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -1069,3 +1069,4 @@
VAR__FILTERTYPE__INTERNAL=$filterType internal
POWER_MANAGEMENT_ACTION_ON_ENTITY_ALREADY_IN_PROGRESS=Another power management
action, ${action}, is already in progress.
NETWORK_LABEL_CONFLICT=The networks represented by label cannot be configured
on the same network interface.
+LABELED_NETWORK_INTERFACE_NOT_FOUND=A labeled network interface could not be
found.
--
To view, visit http://gerrit.ovirt.org/22949
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea07be387e71f0dfb8d9a78d8e03c504095c2062
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
