Hello Juan Hernandez,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/27006
to review the following change.
Change subject: restapi: Validate dest when importing template
......................................................................
restapi: Validate dest when importing template
When importing a template it is mandatory to specify the destination
storage domain. The RESTAPI doesn't currently validate this, and thus
the request is accepted and eventually it generates a NPE since
AbstractBackendStorageDomainContentResource#getDestStorageDomainId is counting
on the storage id.
This patch changes the RESTAPI so that it validates that the id or name of the
destination storage domain has been provided. If it isn't provided it
will generate the following error response:
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<fault>
<reason>Incomplete parameters</reason>
<detail>Action [storageDomain.id|name] required for doImport</detail>
</fault>
The patch should keep backward compatibility since before it, we got an
NPE, and now it is being replaced with an informative message.
Change-Id: I2cf2d94514b159c34f19a7f0377fcb2a9afd1c19
Bug-Url: https://bugzilla.redhat.com/1081173
Signed-off-by: Juan Hernandez <[email protected]>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/27006/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
index 201ce65..c0800ee 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
@@ -39,7 +39,7 @@
@Override
public Response doImport(Action action) {
- validateParameters(action, "cluster.id|name");
+ validateParameters(action, "cluster.id|name", "storageDomain.id|name");
Guid destStorageDomainId = getDestStorageDomainId(action);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
index 8b9c340..db98caa 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
@@ -242,7 +242,7 @@
resource.doImport(new Action());
fail("expected WebApplicationException on incomplete parameters");
} catch (WebApplicationException wae) {
- verifyIncompleteException(wae, "Action", "doImport",
"cluster.id|name");
+ verifyIncompleteException(wae, "Action", "doImport",
"cluster.id|name", "storageDomain.id|name");
}
}
--
To view, visit http://gerrit.ovirt.org/27006
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cf2d94514b159c34f19a7f0377fcb2a9afd1c19
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Maor Lipchuk <[email protected]>
Gerrit-Reviewer: Juan Hernandez <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
