Ravi Nori has uploaded a new change for review. Change subject: restapi: VM-runtime-only information presented after VM goes down (#869682) ......................................................................
restapi: VM-runtime-only information presented after VM goes down (#869682) VM-runtime-only display information is presented by api after VM goes down The runtime only information like address, port, secure_port, start_time and boot priority need to be hidden when the vm is not running. Change-Id: Ie36fa8049c8ddad483e7e16f13a3d0a029f8f218 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=869682 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java 2 files changed, 17 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/9090/1 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 81cd791..9129aa1 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 @@ -285,7 +285,7 @@ os.setType(osType.value()); } } - if (entity.getboot_sequence() != null) { + if (getIsVmRunning(entity) && entity.getboot_sequence() != null) { for (Boot boot : map(entity.getdefault_boot_sequence(), null)) { os.getBoot().add(boot); } @@ -312,7 +312,7 @@ pool.setId(entity.getVmPoolId().toString()); model.setVmPool(pool); } - if (entity.getrun_on_vds() != null) { + if (getIsVmRunning(entity) && entity.getrun_on_vds() != null) { model.setHost(new Host()); model.getHost().setId(entity.getrun_on_vds().toString()); } @@ -323,11 +323,13 @@ } else { model.getDisplay().setType(map(entity.getdefault_display_type(), null)); } - model.getDisplay().setAddress(entity.getdisplay_ip()); - Integer displayPort = entity.getdisplay(); - model.getDisplay().setPort(displayPort==null || displayPort==-1 ? null : displayPort); - Integer displaySecurePort = entity.getdisplay_secure_port(); - model.getDisplay().setSecurePort(displaySecurePort==null || displaySecurePort==-1 ? null : displaySecurePort); + if (getIsVmRunning(entity) && entity.getDynamicData() != null) { + model.getDisplay().setAddress(entity.getdisplay_ip()); + Integer displayPort = entity.getdisplay(); + model.getDisplay().setPort(displayPort==null || displayPort==-1 ? null : displayPort); + Integer displaySecurePort = entity.getdisplay_secure_port(); + model.getDisplay().setSecurePort(displaySecurePort==null || displaySecurePort==-1 ? null : displaySecurePort); + } model.getDisplay().setMonitors(entity.getnum_of_monitors()); model.getDisplay().setAllowOverride(entity.getAllowConsoleReconnect()); model.getDisplay().setSmartcardEnabled(entity.isSmartcardEnabled()); @@ -343,7 +345,7 @@ if (entity.getvm_creation_date() != null) { model.setCreationTime(DateMapper.map(entity.getvm_creation_date(), null)); } - if (entity.getDynamicData() != null && entity.getDynamicData().getLastStartTime()!=null) { + if (getIsVmRunning(entity) && entity.getDynamicData() != null && entity.getDynamicData().getLastStartTime()!=null) { model.setStartTime(DateMapper.map(entity.getDynamicData().getLastStartTime(), null)); } model.setPlacementPolicy(new VmPlacementPolicy()); @@ -360,7 +362,7 @@ domain.setName(entity.getvm_domain()); model.setDomain(domain); } - if (entity.getvm_ip()!=null && !entity.getvm_ip().isEmpty()) { + if (getIsVmRunning(entity) && entity.getvm_ip()!=null && !entity.getvm_ip().isEmpty()) { model.setGuestInfo(new GuestInfo()); model.getGuestInfo().setIps(new IPs()); for (String item : entity.getvm_ip().split(" ")) { diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java index cebfc3a..2e47bd4 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java @@ -12,6 +12,7 @@ import org.ovirt.engine.api.model.VmDeviceType; import org.ovirt.engine.api.model.VmType; import org.ovirt.engine.core.common.businessentities.OriginType; +import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VmDynamic; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.VmStatistics; @@ -37,6 +38,7 @@ statistics.setcpu_user(new Double(10L)); statistics.setcpu_sys(new Double(20L)); VmDynamic dynamic = new VmDynamic(); + dynamic.setstatus(VMStatus.Up); dynamic.setdisplay_type(to.getdefault_display_type()); org.ovirt.engine.core.common.businessentities.VM ret = new org.ovirt.engine.core.common.businessentities.VM(to, @@ -110,6 +112,7 @@ public void testGustIp() { org.ovirt.engine.core.common.businessentities.VM vm = new org.ovirt.engine.core.common.businessentities.VM(); VmDynamic vmDynamic = new VmDynamic(); + vmDynamic.setstatus(VMStatus.Up); vmDynamic.setvm_ip("2.2.2.2"); vm.setDynamicData(vmDynamic); @@ -122,6 +125,7 @@ public void testGustIps() { org.ovirt.engine.core.common.businessentities.VM vm = new org.ovirt.engine.core.common.businessentities.VM(); VmDynamic vmDynamic = new VmDynamic(); + vmDynamic.setstatus(VMStatus.Up); vmDynamic.setvm_ip("2.2.2.2 2.2.2.3 2.2.2.4"); vm.setDynamicData(vmDynamic); @@ -136,6 +140,7 @@ public void testDisplayPort() { org.ovirt.engine.core.common.businessentities.VM entity = new org.ovirt.engine.core.common.businessentities.VM(); + entity.setstatus(VMStatus.Up); entity.setdisplay(5900); entity.setdisplay_secure_port(9999); VM model = VmMapper.map(entity, null); @@ -168,6 +173,7 @@ public void testMapHostId() { org.ovirt.engine.core.common.businessentities.VM entity = new org.ovirt.engine.core.common.businessentities.VM(); + entity.setstatus(VMStatus.Up); Guid guid = NGuid.NewGuid(); entity.setrun_on_vds(guid); VM model = VmMapper.map(entity, null); -- To view, visit http://gerrit.ovirt.org/9090 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie36fa8049c8ddad483e7e16f13a3d0a029f8f218 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
