Yaniv Bronhaim has uploaded a new change for review. Change subject: core: Add validation for empty compute resource or host group ......................................................................
core: Add validation for empty compute resource or host group Change-Id: Id26697e3e7a1b98c7e5e557cff3fd7078aecb67a Signed-off-by: Yaniv Bronhaim <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.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 frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties 4 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/31287/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java index 7606b4a..54ea555 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java @@ -103,6 +103,14 @@ } if (getParameters().getAddProvisioned()) { + if (getParameters().getComputeResource() == null) { + log.errorFormat("Failed to provision: Compute resource cannot be empty"); + throw new VdcBLLException(VdcBllErrors.PROVIDER_PROVISION_MISSING_COMPUTERESOURCE); + } + if (getParameters().getHostGroup() == null) { + log.errorFormat("Failed to provision: Host group cannot be empty"); + throw new VdcBLLException(VdcBllErrors.PROVIDER_PROVISION_MISSING_HOSTGROUP); + } HostProviderProxy proxy = ((HostProviderProxy) ProviderProxyFactory.getInstance().create(getHostProvider())); getParameters().getvds().getStaticData().setHostProviderId(getParameters().getProviderId()); 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 c02dd36..7bbe9b3 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 @@ -436,6 +436,8 @@ VM_NOT_QUALIFIED_FOR_SNAPSHOT_MERGE(5054), VM_HOST_CANNOT_LIVE_MERGE(5055), PROVIDER_AUTHENTICATION_FAILURE(5056), + PROVIDER_PROVISION_MISSING_HOSTGROUP(5057), + PROVIDER_PROVISION_MISSING_COMPUTERESOURCE(5058), // Network Labels LABELED_NETWORK_INTERFACE_NOT_FOUND(5200), 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 f7c2c3e..95376d0 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -390,6 +390,8 @@ PROVIDER_IMPORT_CERTIFICATE_CHAIN_ERROR=Failed to import provider certificate chain. PROVIDER_SSL_FAILURE=SSL problem while trying to connect to the external provider. PROVIDER_AUTHENTICATION_FAILURE=Failed to authenticate with the external provider. Please confirm username and passowrd. +PROVIDER_PROVISION_MISSING_HOSTGROUP=Provision failure: Must choose host group to provision new host. +PROVIDER_PROVISION_MISSING_COMPUTERESOURCE=Provision failure: Must choose compute resource to provision new host. FAILED_UPDATE_RUNNING_VM=Failed to update VM while it is running, please try again when the VM is Down. VM_NOT_QUALIFIED_FOR_SNAPSHOT_MERGE=To merge snapshots, a VM must be Down, Up or Paused. VM_HOST_CANNOT_LIVE_MERGE=The host on which this VM is running does not support live merging snapshots. 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 a8569a9..b167d4a 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 @@ -324,6 +324,8 @@ PROVIDER_IMPORT_CERTIFICATE_CHAIN_ERROR=Failed to import provider certificate chain. PROVIDER_SSL_FAILURE=SSL problem while trying to connect to the external provider. PROVIDER_AUTHENTICATION_FAILURE=Failed to authenticate with the external provider. Please confirm username and passowrd. +PROVIDER_PROVISION_MISSING_HOSTGROUP=Provision failure: Must choose host group to provision new host. +PROVIDER_PROVISION_MISSING_COMPUTERESOURCE=Provision failure: Must choose compute resource to provision new host. FAILED_UPDATE_RUNNING_VM=Failed to update VM while it is running, please try again when the VM is Down. VM_NOT_QUALIFIED_FOR_SNAPSHOT_MERGE=To merge snapshots, a VM must be Down, Up or Paused. VM_HOST_CANNOT_LIVE_MERGE=The host on which this VM is running does not support live merging snapshots. -- To view, visit http://gerrit.ovirt.org/31287 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id26697e3e7a1b98c7e5e557cff3fd7078aecb67a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
