[Engine-patches] Change in ovirt-engine[master]: restapi: Add link to job for actions, when job exists

[oliel]

Ori Liel has uploaded a new change for review.

Change subject: restapi: Add link to job for actions, when job exists
......................................................................

restapi: Add link to job for actions, when job exists

Change-Id: Ie39395e30970ace08e8c7de3148adb3f958f1937
Signed-off-by: Ori Liel <ol...@redhat.com>
---
M 
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
M 
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/20363/1

diff --git 
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
 
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
index 7f96ec8..ec40e9b 100644
--- 
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
+++ 
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
@@ -190,6 +190,7 @@
       <!-- resolve GlusterHook using one of the resolution -->
       <xs:element name="resolution_type" type="xs:string" minOccurs="0" 
maxOccurs="1"/>
       <!-- ... etc., explicitly enumerate all the parameter types -->
+      <xs:element name="job" type="Job" minOccurs="0"/>
     </xs:sequence>
   </xs:group>
 
diff --git 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
index 894d496..046df52 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
@@ -15,6 +15,7 @@
 import org.ovirt.engine.api.model.Action;
 import org.ovirt.engine.api.model.BaseResource;
 import org.ovirt.engine.api.model.CreationStatus;
+import org.ovirt.engine.api.model.Job;
 import org.ovirt.engine.api.resource.ActionResource;
 import org.ovirt.engine.core.common.action.VdcActionParametersBase;
 import org.ovirt.engine.core.common.action.VdcActionType;
@@ -72,6 +73,9 @@
         awaitGrace(action);
         try {
             VdcReturnValueBase actionResult = doAction(task, params);
+            if (actionResult.getJobId() != null) {
+                setJobLink(action, actionResult);
+            }
             if (actionResult.getHasAsyncTasks()) {
                 if (expectBlocking(action)) {
                     CreationStatus status = awaitCompletion(actionResult, 
pollingType);
@@ -87,6 +91,13 @@
         }
     }
 
+    private void setJobLink(final Action action, VdcReturnValueBase 
actionResult) {
+        Job job = new Job();
+        job.setId(actionResult.getJobId().toString());
+        LinkHelper.addLinks(getUriInfo(), job);
+        action.setJob(job);
+    }
+
     /**
      * Perform an action, managing asynchrony and returning an appropriate
      * response with entity returned by backend in action body.


-- 
To view, visit http://gerrit.ovirt.org/20363
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie39395e30970ace08e8c7de3148adb3f958f1937
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ori Liel <ol...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches