Muli Salem has uploaded a new change for review. Change subject: core: Error Code Handling for AddVmNic (#858719) ......................................................................
core: Error Code Handling for AddVmNic (#858719) https://bugzilla.redhat.com/858719 This patch makes sure the activating/deactivating failure is passed on from ActivateDeactivateVmNicCommand to AddVmInterfaceCommand. It also adds the vdsm error codes for activation/deactivation failure. Change-Id: I2b2ac5495f3b85d4b8b9a9f8b68e7eaf2c2af145 Signed-off-by: Muli Salem <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.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/VdsmErrors.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties 7 files changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/8150/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java index 411ca54..c9198a5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java @@ -108,10 +108,7 @@ activateParameters, ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (!activateVmNicReturnValue.getSucceeded()) { - getReturnValue().getExecuteFailedMessages().add("Failed activating nic."); - getReturnValue().getCanDoActionMessages().addAll(activateVmNicReturnValue.getCanDoActionMessages()); - getReturnValue().getCanDoActionMessages().remove(VdcBllMessages.VAR__ACTION__ADD.name()); - getReturnValue().setCanDoAction(false); + propagateFailure(activateVmNicReturnValue); } return activateVmNicReturnValue.getSucceeded(); } @@ -268,4 +265,11 @@ } return permissionList; } + + private void propagateFailure(VdcReturnValueBase internalReturnValue) { + getReturnValue().getExecuteFailedMessages().addAll(internalReturnValue.getExecuteFailedMessages()); + getReturnValue().setFault(internalReturnValue.getFault()); + getReturnValue().getCanDoActionMessages().addAll(internalReturnValue.getCanDoActionMessages()); + getReturnValue().setCanDoAction(internalReturnValue.getCanDoAction()); + } } 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 d822f97..d5a3492 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 @@ -43,6 +43,8 @@ FailedToUnPlugDisk(46), MIGRATION_CANCEL_ERROR(47), SNAPSHOT_FAILED(48), + ACTIVATE_NIC_FAILED(49), + DEACTIVATE_NIC_FAILED(50), recovery(99), GeneralException(100), StorageException(200), diff --git a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties index 2e6c1ac..f91e337 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -349,3 +349,5 @@ SNAPSHOT_FAILED=Live snapshot failed. # Gluster engine errors NO_UP_SERVER_FOUND=No server found in Up status. +ACTIVATE_NIC_FAILED=Failed to activate Nic. +DEACTIVATE_NIC_FAILED=Failed to deactivate Nic. diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java index 8c85ba1..6fcdab5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java @@ -170,6 +170,8 @@ case VOLUME_GROUP_BLOCK_SIZE_ERROR: case MIGRATION_DEST_INVALID_HOSTNAME: case DEVICE_BLOCK_SIZE_NOT_SUPPORTED: + case ACTIVATE_NIC_FAILED: + case DEACTIVATE_NIC_FAILED: if (this instanceof IrsBrokerCommand) { outEx = new IrsOperationFailedNoFailoverException(getReturnStatus().mMessage); } else { diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java index b383769..2c15ba2 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java @@ -688,4 +688,8 @@ @DefaultStringValue("Gluster Host Remove Failed.") String GlusterHostRemoveFailed(); + + String ACTIVATE_NIC_FAILED(); + + String DEACTIVATE_NIC_FAILED(); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties index 14e0aaa..ab2dc31 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties @@ -332,3 +332,5 @@ VM_TEMPLATE_CANT_LOCATE_DISKS_IN_DB=Cannot locate the Templates' disks in the database. VM_WITH_SAME_NAME_EXIST=VM with the same name already exists. SNAPSHOT_FAILED=Live snapshot failed. +ACTIVATE_NIC_FAILED=Failed to activate Nic. +DEACTIVATE_NIC_FAILED=Failed to deactivate Nic. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties index 14e0aaa..ab2dc31 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties @@ -332,3 +332,5 @@ VM_TEMPLATE_CANT_LOCATE_DISKS_IN_DB=Cannot locate the Templates' disks in the database. VM_WITH_SAME_NAME_EXIST=VM with the same name already exists. SNAPSHOT_FAILED=Live snapshot failed. +ACTIVATE_NIC_FAILED=Failed to activate Nic. +DEACTIVATE_NIC_FAILED=Failed to deactivate Nic. -- To view, visit http://gerrit.ovirt.org/8150 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b2ac5495f3b85d4b8b9a9f8b68e7eaf2c2af145 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
