Hello Eli Mesika,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/18389
to review the following change.
Change subject: core: [ExternalTasks] When adding new step...
......................................................................
core: [ExternalTasks] When adding new step...
[ExternalTasks] When adding new step, state is always STARTED
Removing the state parameter when adding a new step, it is really set
implicitly to STARTED.
Change-Id: I16ad3d25d527360b8cfb9eaefc66569700a3e4b0
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=988087
Signed-off-by: Eli Mesika <[email protected]>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddExternalStepCommandTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddExternalStepParameters.java
M
backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
4 files changed, 5 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/18389/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddExternalStepCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddExternalStepCommandTest.java
index d13d001..2a1b25e 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddExternalStepCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddExternalStepCommandTest.java
@@ -13,7 +13,6 @@
import org.mockito.runners.MockitoJUnitRunner;
import org.ovirt.engine.core.common.action.AddExternalStepParameters;
import org.ovirt.engine.core.common.job.Job;
-import org.ovirt.engine.core.common.job.JobExecutionStatus;
import org.ovirt.engine.core.common.job.StepEnum;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.JobDao;
@@ -39,7 +38,7 @@
@Before
public void createParameters() {
- parameters = new AddExternalStepParameters(jobId, "step 1",
StepEnum.VALIDATING, JobExecutionStatus.STARTED);
+ parameters = new AddExternalStepParameters(jobId, "step 1",
StepEnum.VALIDATING);
}
private Job makeExternalTestJob(Guid jobId) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddExternalStepParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddExternalStepParameters.java
index 9b074f6..dd1a60e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddExternalStepParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddExternalStepParameters.java
@@ -1,6 +1,5 @@
package org.ovirt.engine.core.common.action;
-import org.ovirt.engine.core.common.job.JobExecutionStatus;
import org.ovirt.engine.core.common.job.StepEnum;
import org.ovirt.engine.core.compat.Guid;
@@ -14,7 +13,6 @@
private Guid parentId;
private String description;
private StepEnum stepType;
- private JobExecutionStatus status;
public Guid getParentId() {
return parentId;
@@ -22,14 +20,6 @@
public void setParentId(Guid id) {
this.parentId = id;
- }
-
- public JobExecutionStatus getStatus() {
- return status;
- }
-
- public void setStatus(JobExecutionStatus status) {
- this.status = status;
}
public StepEnum getStepType() {
@@ -48,12 +38,11 @@
this.description = description;
}
- public AddExternalStepParameters(Guid id, String description, StepEnum
stepType, JobExecutionStatus status) {
+ public AddExternalStepParameters(Guid id, String description, StepEnum
stepType) {
super();
this.parentId = id;
this.description = description;
this.stepType = stepType;
- this.status = status;
this.setParentId(id);
}
}
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
index 1021e55..15eafb9 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
+++
b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
@@ -3351,7 +3351,7 @@
body:
parameterType: Step
signatures:
- - mandatoryArguments: {step.type: 'xs:string' , step.description:
'xs:string', step.status.state: 'xs:string'}
+ - mandatoryArguments: {step.type: 'xs:string' , step.description:
'xs:string'}
optionalArguments: {step.job.id: 'xs:string', step.parent_step.id:
'xs:string'}
urlparams: {}
headers:
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
index c169573..e414587 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
@@ -13,7 +13,6 @@
import org.ovirt.engine.api.resource.StepResource;
import org.ovirt.engine.api.resource.StepsResource;
import org.ovirt.engine.api.restapi.types.StepMapper;
-import org.ovirt.engine.api.restapi.types.JobMapper;
import org.ovirt.engine.core.common.action.AddExternalStepParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.queries.GetStepsByJobIdQueryParameters;
@@ -39,7 +38,7 @@
@Override
public Response add(Step step) {
- validateParameters(step, "type", "status.state" , "description");
+ validateParameters(step, "type", "description");
String id;
if (step.isSetParentStep()) {
validateParameters(step, "step.parentStep.id");
@@ -50,7 +49,7 @@
}
return performCreate(VdcActionType.AddExternalStep,
- new AddExternalStepParameters(asGuid(id),
step.getDescription(),StepMapper.map(StepEnum.fromValue(step.getType())),
JobMapper.map(step.getStatus(), null)),
+ new AddExternalStepParameters(asGuid(id),
step.getDescription(),StepMapper.map(StepEnum.fromValue(step.getType()))),
new QueryIdResolver<Guid>(VdcQueryType.GetStepByStepId,
IdQueryParameters.class));
}
--
To view, visit http://gerrit.ovirt.org/18389
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16ad3d25d527360b8cfb9eaefc66569700a3e4b0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Yair Zaslavsky <[email protected]>
Gerrit-Reviewer: Eli Mesika <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
