Martin Betak has uploaded a new change for review. Change subject: restapi: Expose Vm#runInPaused property ......................................................................
restapi: Expose Vm#runInPaused property Added new element to VM and Template schema: <start_paused> true|false </start_paused> Change-Id: I142adaa9929e3fc8d67311ff7610a9f4557666ff Signed-off-by: Martin Betak <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.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/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java 6 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/30104/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 adbe8fd..5ff3af2 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 @@ -2638,6 +2638,7 @@ <!-- also rel="cdroms/disks/nics/watchdogs" links, see Devices below --> <xs:element name="version" type="TemplateVersion" minOccurs="0" maxOccurs="1"/> <xs:element ref="serial_number" minOccurs="0" maxOccurs="1" /> + <xs:element name="start_paused" type="xs:boolean" minOccurs="0" maxOccurs="1" /> </xs:sequence> </xs:extension> </xs:complexContent> @@ -3076,6 +3077,7 @@ <xs:element ref="serial_number" minOccurs="0" maxOccurs="1" /> <xs:element name="next_run_configuration_exists" type="xs:boolean" minOccurs="0" maxOccurs="1"/> <xs:element name="numa_tune_mode" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="start_paused" type="xs:boolean" minOccurs="0" maxOccurs="1" /> </xs:sequence> </xs:extension> </xs:complexContent> 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 f4cc4fd..790b49d 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 @@ -103,6 +103,7 @@ vm.serial_number.value: xs:string vm.bios.boot_menu.enabled: xs:boolean vm.numa_tune_mode: xs:string + vm.start_paused: xs:boolean description: update the virtual machine in the system for the given virtual machine id with the values specified in the request urlparams: {} headers: @@ -190,6 +191,7 @@ vm.serial_number.value: xs:string vm.bios.boot_menu.enabled: xs:boolean vm.numa_tune_mode: xs:string + vm.start_paused: xs:boolean description: add a virtual machine to the system from scratch # the following signature is for clone VM from a Snapshot - requires the Snapshot ID - mandatoryArguments: {vm.name: 'xs:string', vm.template.id|name: 'xs:string', vm.cluster.id|name: 'xs:string', @@ -244,6 +246,7 @@ vm.serial_number.value: xs:string vm.bios.boot_menu.enabled: xs:boolean vm.numa_tune_mode: xs:string + vm.start_paused: xs:boolean description: add a virtual machine to the system by cloning from a snapshot # the following signature is for adding VM from a configuration - requires the configuration type and the configuration data - mandatoryArguments: {vm.initialization.configuration.type: 'xs:string', vm.initialization.configuration.data: 'xs:string'} @@ -300,6 +303,7 @@ vm.serial_number.value: xs:string vm.bios.boot_menu.enabled: xs:boolean vm.numa_tune_mode: xs:string + vm.start_paused: xs:boolean description: add a virtual machine to the system from a configuration - requires the configuration type and the configuration data urlparams: {} headers: @@ -3664,6 +3668,7 @@ template.serial_number.policy: xs:string template.serial_number.value: xs:string template.bios.boot_menu.enabled: xs:boolean + template.start_paused: xs:boolean description: update the specified template in the system urlparams: {} headers: @@ -3727,6 +3732,7 @@ template.bios.boot_menu.enabled: xs:boolean template.cluster.id: xs:string template.cluster.name: xs:string + template.start_paused: xs:boolean description: add a new template to the system urlparams: {} headers: diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java index fefa1a4..6024b72 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java @@ -192,6 +192,9 @@ if (model.isSetSerialNumber()) { SerialNumberMapper.copySerialNumber(model.getSerialNumber(), entity); } + if (model.isSetStartPaused()) { + entity.setRunAndPause(model.isStartPaused()); + } return entity; } @@ -322,6 +325,9 @@ if (model.isSetSerialNumber()) { SerialNumberMapper.copySerialNumber(model.getSerialNumber(), staticVm); } + if (model.isSetStartPaused()) { + staticVm.setRunAndPause(model.isStartPaused()); + } return staticVm; } @@ -432,6 +438,8 @@ model.setSerialNumber(SerialNumberMapper.map(entity, null)); } + model.setStartPaused(entity.isRunAndPause()); + return model; } 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 2c8bed9..64d1b6f 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 @@ -330,6 +330,10 @@ } } + if (vm.isSetStartPaused()) { + staticVm.setRunAndPause(vm.isStartPaused()); + } + return staticVm; } @@ -575,6 +579,7 @@ } model.setNextRunConfigurationExists(entity.isNextRunConfigurationExists()); model.setNumaTuneMode(map(entity.getNumaTuneMode(), null)); + model.setStartPaused(entity.isRunAndPause()); return model; } diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java index 1614b70..2ecadbf 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java @@ -88,5 +88,6 @@ assertEquals(model.getSerialNumber().getValue(), transform.getSerialNumber().getValue()); assertEquals(model.getDisplay().isFileTransferEnabled(), transform.getDisplay().isFileTransferEnabled()); assertEquals(model.getDisplay().isCopyPasteEnabled(), transform.getDisplay().isCopyPasteEnabled()); + assertEquals(model.isStartPaused(), transform.isStartPaused()); } } 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 bb1ac1b..60805f8 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 @@ -150,6 +150,7 @@ assertEquals(model.getSerialNumber().getValue(), transform.getSerialNumber().getValue()); assertEquals(model.getDisplay().isFileTransferEnabled(), transform.getDisplay().isFileTransferEnabled()); assertEquals(model.getDisplay().isCopyPasteEnabled(), transform.getDisplay().isCopyPasteEnabled()); + assertEquals(model.isStartPaused(), transform.isStartPaused()); } @Test -- To view, visit http://gerrit.ovirt.org/30104 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I142adaa9929e3fc8d67311ff7610a9f4557666ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
