Ravi Nori has uploaded a new change for review. Change subject: restapi: API should expose hypervisor version (#829625) ......................................................................
restapi: API should expose hypervisor version (#829625) Restapi should include the hypervisor version in /api/hosts and /api/hosts/xxx Change-Id: Id8d3d090ae4c0ba489f3c7484d5c232c55f3c059 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=829625 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java 6 files changed, 29 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/9220/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java index 5f76538..5227ea4 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java @@ -53,6 +53,7 @@ import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqQueryParams; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.verify; +import org.ovirt.engine.core.compat.RpmVersion; public class BackendHostResourceTest extends AbstractBackendSubResourceTest<Host, VDS, BackendHostResource> { @@ -599,7 +600,7 @@ @Override protected VDS getEntity(int index) { - VDS entity = setUpEntityExpectations(control.createMock(VDS.class), index); + VDS entity = setUpEntityExpectations(control.createMock(VDS.class), control.createMock(RpmVersion.class), index); VdsStatic vdsStatic = control.createMock(VdsStatic.class); expect(vdsStatic.getId()).andReturn(GUIDS[index]).anyTimes(); expect(entity.getStaticData()).andReturn(vdsStatic).anyTimes(); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java index 5345aa4..866a87a 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java @@ -22,6 +22,7 @@ import org.ovirt.engine.core.common.queries.VdcQueryType; import static org.easymock.EasyMock.expect; +import org.ovirt.engine.core.compat.RpmVersion; public class BackendHostsResourceTest extends AbstractBackendCollectionResourceTest<Host, VDS, BackendHostsResource> { @@ -271,14 +272,14 @@ } protected VDS getEntity(int index) { - return setUpEntityExpectations(control.createMock(VDS.class), control.createMock(VdsStatistics.class), index); + return setUpEntityExpectations(control.createMock(VDS.class), control.createMock(VdsStatistics.class), control.createMock(RpmVersion.class), index); } - static VDS setUpEntityExpectations(VDS entity, int index) { - return setUpEntityExpectations(entity, null, index); + static VDS setUpEntityExpectations(VDS entity, RpmVersion version, int index) { + return setUpEntityExpectations(entity, null, version, index); } - static VDS setUpEntityExpectations(VDS entity, VdsStatistics statistics, int index) { + static VDS setUpEntityExpectations(VDS entity, VdsStatistics statistics, RpmVersion version, int index) { expect(entity.getId()).andReturn(GUIDS[index]).anyTimes(); expect(entity.getvds_name()).andReturn(NAMES[index]).anyTimes(); expect(entity.gethost_name()).andReturn(ADDRESSES[index]).anyTimes(); @@ -286,6 +287,14 @@ if (statistics != null) { setUpStatisticalEntityExpectations(entity, statistics); } + if(version != null) { + expect(version.getBuild()).andReturn(0).anyTimes(); + expect(version.getMajor()).andReturn(4).anyTimes(); + expect(version.getMinor()).andReturn(10).anyTimes(); + expect(version.getRevision()).andReturn(0).anyTimes(); + expect(version.getRpmName()).andReturn("vdsm-4.10.0-10.fc17").anyTimes(); + expect(entity.getVersion()).andReturn(version).anyTimes(); + } return entity; } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java index 1400213..ad70def 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java @@ -18,6 +18,7 @@ import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.compat.RpmVersion; public class BackendResourceTest extends AbstractBackendBaseTest { BackendHostResource resource; @@ -115,7 +116,7 @@ protected VDS getEntity(int index) { - VDS vds = setUpEntityExpectations(control.createMock(VDS.class), index); + VDS vds = setUpEntityExpectations(control.createMock(VDS.class), control.createMock(RpmVersion.class), index); VdsStatic vdsStatic = control.createMock(VdsStatic.class); expect(vdsStatic.getId()).andReturn(GUIDS[2]).anyTimes(); expect(vds.getStaticData()).andReturn(vdsStatic).anyTimes(); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java index 1831c74..1f4ddc8 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResourceTest.java @@ -35,6 +35,7 @@ import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase; import org.ovirt.engine.core.common.queries.StorageServerConnectionQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.compat.RpmVersion; public class BackendStorageDomainsResourceTest extends AbstractBackendCollectionResourceTest<StorageDomain, storage_domains, BackendStorageDomainsResource> { @@ -155,7 +156,7 @@ @Test public void testRemoveWithHostName() throws Exception { setUpGetEntityExpectations(); - VDS host = BackendHostsResourceTest.setUpEntityExpectations(control.createMock(VDS.class), 1); + VDS host = BackendHostsResourceTest.setUpEntityExpectations(control.createMock(VDS.class), control.createMock(RpmVersion.class), 1); setUpGetEntityExpectations("Hosts: name=" + NAMES[1], SearchType.VDS, host); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java index 65a93d8..9dc0f77 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java @@ -64,6 +64,7 @@ import static org.ovirt.engine.api.restapi.resource.BackendVmsResourceTest.setUpEntityExpectations; import static org.ovirt.engine.api.restapi.resource.BackendVmsResourceTest.setUpStatisticalEntityExpectations; import static org.ovirt.engine.api.restapi.resource.BackendVmsResourceTest.verifyModelSpecific; +import org.ovirt.engine.core.compat.RpmVersion; public class BackendVmResourceTest extends AbstractBackendSubResourceTest<VM, org.ovirt.engine.core.common.businessentities.VM, BackendVmResource> { @@ -693,7 +694,7 @@ } protected void setUpGetHostIdExpectations(int idx) throws Exception { - VDS host = BackendHostsResourceTest.setUpEntityExpectations(control.createMock(VDS.class), idx); + VDS host = BackendHostsResourceTest.setUpEntityExpectations(control.createMock(VDS.class), control.createMock(RpmVersion.class), idx); setUpGetEntityExpectations(VdcQueryType.GetVdsByName, GetVdsByNameParameters.class, new String[] { "Name" }, diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java index 6dac49e..c889ce0 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java @@ -16,6 +16,7 @@ import org.ovirt.engine.api.model.PowerManagement; import org.ovirt.engine.api.model.StorageManager; import org.ovirt.engine.api.model.TransparentHugePages; +import org.ovirt.engine.api.model.Version; import org.ovirt.engine.api.model.VmSummary; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; @@ -136,6 +137,13 @@ sm.setPriority(entity.getVdsSpmPriority()); sm.setValue(entity.getspm_status() == VdsSpmStatus.SPM); model.setStorageManager(sm); + Version version = new Version(); + version.setMajor(entity.getVersion().getMajor()); + version.setMinor(entity.getVersion().getMinor()); + version.setRevision(entity.getVersion().getRevision()); + version.setBuild(entity.getVersion().getBuild()); + version.setFullVersion(entity.getVersion().getRpmName()); + model.setVersion(version); model.setKsm(new KSM()); model.getKsm().setEnabled(Boolean.TRUE.equals(entity.getksm_state())); model.setTransparentHugepages(new TransparentHugePages()); -- To view, visit http://gerrit.ovirt.org/9220 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8d3d090ae4c0ba489f3c7484d5c232c55f3c059 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
