Laszlo Hornyak has uploaded a new change for review.
Change subject: fixup
......................................................................
fixup
Change-Id: Icd4cec33379be23d0755f394c99e9b4854b8ae97
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
M
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java
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/BackendCapabilitiesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/FeaturesHelper.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java
13 files changed, 32 insertions(+), 61 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/15710/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
index b65f99e..90a06e4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
@@ -30,7 +30,7 @@
watchdogDevice.setSpecParams(getSpecParams());
getVmDeviceDao().save(watchdogDevice);
setSucceeded(true);
- setActionReturnValue(watchdogDevice);
+ setActionReturnValue(watchdogDevice.getId());
}
@Override
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java
index b4bcb53..8cbc396 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java
@@ -19,7 +19,6 @@
VmDevice watchdogDevice = watchdogs.get(0); // there must be only one
watchdogDevice.setSpecParams(getSpecParams());
getVmDeviceDao().update(watchdogDevice);
- setActionReturnValue(watchdogDevice);
setSucceeded(true);
}
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
index a7d8dde..591eee9 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/TemplateResource.java
@@ -17,22 +17,20 @@
package org.ovirt.engine.api.resource;
import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
-import javax.ws.rs.POST;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-import org.jboss.resteasy.annotations.providers.jaxb.Formatted;
-import org.ovirt.engine.api.model.Actionable;
+import org.jboss.resteasy.annotations.providers.jaxb.Formatted;
import org.ovirt.engine.api.model.Action;
+import org.ovirt.engine.api.model.Actionable;
import org.ovirt.engine.api.model.CdRom;
import org.ovirt.engine.api.model.CdRoms;
import org.ovirt.engine.api.model.NIC;
import org.ovirt.engine.api.model.Nics;
import org.ovirt.engine.api.model.Template;
-import org.ovirt.engine.api.model.WatchDog;
-import org.ovirt.engine.api.model.WatchDogs;
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON,
MediaType.APPLICATION_X_YAML})
public interface TemplateResource extends UpdatableResource<Template>,
AsynchronouslyCreatedResource {
@@ -60,6 +58,6 @@
public AssignedPermissionsResource getPermissionsResource();
@Path("watchdogs")
- public DevicesResource<WatchDog, WatchDogs> getWatchdogsResource();
+ public WatchdogsResource getWatchdogsResource();
}
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java
index 4656f31..be6820b 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java
+++
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmResource.java
@@ -29,8 +29,6 @@
import org.ovirt.engine.api.model.CdRom;
import org.ovirt.engine.api.model.CdRoms;
import org.ovirt.engine.api.model.VM;
-import org.ovirt.engine.api.model.WatchDog;
-import org.ovirt.engine.api.model.WatchDogs;
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON,
MediaType.APPLICATION_X_YAML})
@@ -117,7 +115,7 @@
public DevicesResource<CdRom, CdRoms> getCdRomsResource();
@Path("watchdogs")
- public DevicesResource<WatchDog, WatchDogs> getWatchdogsResource();
+ public WatchdogsResource getWatchdogsResource();
@Path("disks")
public VmDisksResource getDisksResource();
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 5694b8e..521ea86 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
@@ -2204,7 +2204,7 @@
<!-- also rel="users" links, see Users above -->
<xs:element ref="reported_devices" minOccurs="0" maxOccurs="1"/>
- <xs:element name="watchdogs" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="watchdogs" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -2416,7 +2416,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
+
<xs:element name="watchdog" type="WatchDog"/>
<xs:element name="watchdogs" type="WatchDogs"/>
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
index 3177951..1089bfe 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
@@ -242,7 +242,7 @@
}
private void addWatchdogModels(VersionCaps version, WatchdogModel[]
values) {
- if (VersionUtils.greaterOrEqual(version, VERSION_3_2)) {
+ if (VersionUtils.greaterOrEqual(version, VERSION_3_3)) {
version.setWatchdogModels(new WatchdogModels());
for (WatchdogModel watchdogModel : values) {
version.getWatchdogModels().getWatchdogModels().add(watchdogModel.value());
@@ -251,7 +251,7 @@
}
private void addWatchdogActions(VersionCaps version, WatchdogAction[]
values) {
- if (VersionUtils.greaterOrEqual(version, VERSION_3_2)) {
+ if (VersionUtils.greaterOrEqual(version, VERSION_3_3)) {
version.setWatchdogActions(new WatchdogActions());
for (WatchdogAction watchdogAction : values) {
version.getWatchdogActions().getWatchdogActions().add(watchdogAction.value());
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
index 7a7b7f0..232b14a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java
@@ -10,8 +10,6 @@
import org.ovirt.engine.api.model.NIC;
import org.ovirt.engine.api.model.Nics;
import org.ovirt.engine.api.model.Template;
-import org.ovirt.engine.api.model.WatchDog;
-import org.ovirt.engine.api.model.WatchDogs;
import org.ovirt.engine.api.resource.ActionResource;
import org.ovirt.engine.api.resource.AssignedPermissionsResource;
import org.ovirt.engine.api.resource.CreationResource;
@@ -19,6 +17,7 @@
import org.ovirt.engine.api.resource.ReadOnlyDevicesResource;
import org.ovirt.engine.api.resource.TemplateDisksResource;
import org.ovirt.engine.api.resource.TemplateResource;
+import org.ovirt.engine.api.resource.WatchdogsResource;
import org.ovirt.engine.api.restapi.types.VmMapper;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.MoveVmParameters;
@@ -134,7 +133,7 @@
@Path("watchdogs")
@Override
- public DevicesResource<WatchDog, WatchDogs> getWatchdogsResource() {
+ public WatchdogsResource getWatchdogsResource() {
return inject(new BackendWatchdogsResource(guid,
VdcQueryType.GetWatchdog,
new IdQueryParameters(guid)));
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
index b0b43e5..b8fbba3 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
@@ -23,8 +23,6 @@
import org.ovirt.engine.api.model.Statistics;
import org.ovirt.engine.api.model.Ticket;
import org.ovirt.engine.api.model.VM;
-import org.ovirt.engine.api.model.WatchDog;
-import org.ovirt.engine.api.model.WatchDogs;
import org.ovirt.engine.api.resource.ActionResource;
import org.ovirt.engine.api.resource.AssignedPermissionsResource;
import org.ovirt.engine.api.resource.AssignedTagsResource;
@@ -37,6 +35,7 @@
import org.ovirt.engine.api.resource.VmNicsResource;
import org.ovirt.engine.api.resource.VmReportedDevicesResource;
import org.ovirt.engine.api.resource.VmResource;
+import org.ovirt.engine.api.resource.WatchdogsResource;
import org.ovirt.engine.api.restapi.types.VmMapper;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.ChangeVMClusterParameters;
@@ -141,7 +140,7 @@
}
@Override
- public DevicesResource<WatchDog, WatchDogs> getWatchdogsResource() {
+ public WatchdogsResource getWatchdogsResource() {
return inject(new BackendWatchdogsResource(guid,
VdcQueryType.GetWatchdog,
new IdQueryParameters(guid)));
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java
index 99cb9d6..b234374 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResource.java
@@ -1,7 +1,5 @@
package org.ovirt.engine.api.restapi.resource;
-import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.WatchDog;
import org.ovirt.engine.api.model.WatchDogs;
import org.ovirt.engine.api.resource.DeviceResource;
@@ -10,7 +8,7 @@
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.WatchdogParameters;
-import org.ovirt.engine.core.common.businessentities.VmDevice;
+import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmWatchdog;
import org.ovirt.engine.core.common.businessentities.VmWatchdogAction;
import org.ovirt.engine.core.common.businessentities.VmWatchdogType;
@@ -79,12 +77,7 @@
}
private boolean isVm(Guid id) {
- try {
- getEntity(org.ovirt.engine.core.common.businessentities.VM.class,
VdcQueryType.GetVmByVmId, queryParams, id.toString());
- return true;
- } catch (WebFaultException e) {
- return false;
- }
+ return runQuery(VdcQueryType.GetVmByVmId,
queryParams).getReturnValue() instanceof VM;
}
@Override
@@ -103,13 +96,10 @@
@Override
protected WatchDog doPopulate(WatchDog model, VmWatchdog entity) {
- model.setAction(entity.getAction() == null ? null :
entity.getAction().name());
- model.setModel(entity.getModel() == null ? null :
entity.getModel().name());
- model.setId(entity.getId().toString());
return model;
}
- @Override
+/** @Override
public Response add(final WatchDog device) {
validateEnums(WatchDog.class, device);
return performCreate(addAction,
@@ -123,7 +113,7 @@
return vmWatchdog;
}
});
- }
+ }*/
@Override
protected <T> boolean matchEntity(VmWatchdog entity, T id) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/FeaturesHelper.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/FeaturesHelper.java
index e666632..4f4bf81 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/FeaturesHelper.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/FeaturesHelper.java
@@ -52,10 +52,18 @@
}
if (VersionUtils.greaterOrEqual(version,
BackendCapabilitiesResource.VERSION_3_3)) {
addFeatureVmApplications(features);
+ addWatchdogFeature(features);
}
return features;
}
+ private void addWatchdogFeature(Features features) {
+ Feature feature = new Feature();
+ feature.setName("Watchdog Device");
+ feature.setDescription("Ability to create watchdog devices in VM's");
+ features.getFeature().add(feature);
+ }
+
private void addFeatureSessionBasedAuthentication(Features features) {
Feature feature = new Feature();
feature.setName("Session Based Authentication");
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java
index a3fc018..e2da070 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/WatchdogValidator.java
@@ -10,8 +10,10 @@
@Override
public void validateEnums(WatchDog entity) {
- EnumValidator.validateEnum(WatchdogAction.class, entity.getAction(),
true);
- EnumValidator.validateEnum(WatchdogModel.class, entity.getModel(),
false);
+ if (entity != null) {
+ EnumValidator.validateEnum(WatchdogAction.class,
entity.getAction(), true);
+ EnumValidator.validateEnum(WatchdogModel.class, entity.getModel(),
true);
+ }
}
}
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
index 700a14e..629f61f 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
@@ -428,7 +428,6 @@
model.setQuota(quota);
}
model.setTunnelMigration(entity.getTunnelMigration());
-
return model;
}
@@ -945,27 +944,6 @@
}
return entity;
}
-
- /**
- @Mapping(from = VmWatchdog.class, to = WatchDog.class)
- public static WatchDog map(VmWatchdog entity, WatchDog template) {
- if(entity.getAction() != null && entity.getModel() != null) {
- WatchDog model = new WatchDog();
- model.setAction(entity.getAction());
- model.setModel(entity.getModel());
- model.setId(entity.getId().toString());
- return model;
- }
- return null;
- }
-
- @Mapping(from = WatchDog.class, to = VmWatchdog.class)
- public static VmWatchdog map(WatchDog model, VmWatchdog template) {
- VmWatchdog entity = template ==null ? new VmWatchdog() : template;
- entity.setAction(model.getAction());
- entity.setModel(model.getModel());
- return entity;
- }*/
static String cpuTuneToString(final CpuTune tune) {
final StringBuilder builder = new StringBuilder();
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java
index 57d3152..d348418 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogModel.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.api.restapi.types;
public enum WatchdogModel {
- i6300esb,
- ib700;
+ I6300ESB,
+ IB700;
public String value () {
return this.name().toLowerCase();
}
--
To view, visit http://gerrit.ovirt.org/15710
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd4cec33379be23d0755f394c99e9b4854b8ae97
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
