Martin Beták has uploaded a new change for review. Change subject: restapi: VncKeyboardLayout [WIP] DO NOT MERGE ......................................................................
restapi: VncKeyboardLayout [WIP] DO NOT MERGE Added vnc_keyboard_layout to display Change-Id: Ibdf2b9f74d483a1be9caaa6d6a47ba8de7c37420 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, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/11315/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 707808d..ebe5f30 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 @@ -1972,6 +1972,7 @@ <xs:element name="allow_override" type="xs:boolean" minOccurs="0" maxOccurs="1"/> <xs:element ref="certificate" minOccurs="0" maxOccurs="1"/> <xs:element name="smartcard_enabled" type="xs:boolean" minOccurs="0" maxOccurs="1"/> + <xs:element name="vnc_keyboard_layout" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> 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 c9b0431..cf3c59c 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 @@ -56,6 +56,7 @@ vm.display.type: xs:string vm.display.allow_override: xs:boolean vm.display.smartcard_enabled: xs:boolean + vm.display.vnc_keyboard_layout: xs:string vm.os.cmdline: xs:string vm.cpu.topology.cores: xs:int vm.memory: xs:long @@ -2101,6 +2102,7 @@ template.display.monitors: xs:int template.display.allow_override: xs:boolean template.display.smartcard_enabled: xs:boolean + template.display.vnc_keyboard_layout: xs:string template.os.initRd: xs:string template.usb.enabled: xs:boolean template.usb.type: xs:string @@ -2137,6 +2139,7 @@ template.display.monitors: xs:int template.display.allow_override: xs:boolean template.display.smartcard_enabled: xs:boolean + template.display.vnc_keyboard_layout: xs:string template.os.initRd: xs:string template.usb.enabled: xs:boolean template.usb.type: xs:string 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 323bcb4..f1664e8 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 @@ -113,6 +113,9 @@ if (model.getDisplay().isSetSmartcardEnabled()) { entity.setSmartcardEnabled(model.getDisplay().isSmartcardEnabled()); } + if (model.getDisplay().isSetVncKeyboardLayout()) { + entity.setVncKeyboardLayout(model.getDisplay().getVncKeyboardLayout()); + } } if (model.isSetDomain() && model.getDomain().isSetName()) { entity.setDomain(model.getDomain().getName()); @@ -208,6 +211,9 @@ if (model.getDisplay().isSmartcardEnabled()) { staticVm.setSmartcardEnabled(model.getDisplay().isSmartcardEnabled()); } + if (model.getDisplay().isSetVncKeyboardLayout()) { + staticVm.setVncKeyboardLayout(model.getDisplay().getVncKeyboardLayout()); + } } if (model.isSetDomain() && model.getDomain().isSetName()) { staticVm.setDomain(model.getDomain().getName()); @@ -277,6 +283,7 @@ model.getDisplay().setMonitors(entity.getNumOfMonitors()); model.getDisplay().setAllowOverride(entity.isAllowConsoleReconnect()); model.getDisplay().setSmartcardEnabled(entity.isSmartcardEnabled()); + model.getDisplay().setVncKeyboardLayout(entity.getVncKeyboardLayout()); } if (entity.getCreationDate() != null) { model.setCreationTime(DateMapper.map(entity.getCreationDate(), null)); 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 dc8e5bb..47a9258 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 @@ -98,6 +98,7 @@ staticVm.setAllowConsoleReconnect(entity.isAllowConsoleReconnect()); staticVm.setPriority(entity.getPriority()); staticVm.setUsbPolicy(entity.getUsbPolicy()); + staticVm.setVncKeyboardLayout(entity.getVncKeyboardLayout()); return staticVm; } @@ -200,6 +201,9 @@ } if (vm.getDisplay().isSetSmartcardEnabled()) { staticVm.setSmartcardEnabled(vm.getDisplay().isSmartcardEnabled()); + } + if (vm.getDisplay().isSetVncKeyboardLayout()) { + staticVm.setVncKeyboardLayout(vm.getDisplay().getVncKeyboardLayout()); } } if (vm.isSetPlacementPolicy() && vm.getPlacementPolicy().isSetAffinity()) { @@ -365,6 +369,7 @@ model.getDisplay().setMonitors(entity.getNumOfMonitors()); model.getDisplay().setAllowOverride(entity.getAllowConsoleReconnect()); model.getDisplay().setSmartcardEnabled(entity.isSmartcardEnabled()); + model.getDisplay().setVncKeyboardLayout(entity.getVncKeyboardLayout()); } model.setType(map(entity.getVmType(), null)); model.setStateless(entity.isStateless()); 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 6876cbf..10e3c9e 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 @@ -5,7 +5,6 @@ import org.ovirt.engine.api.model.DisplayType; import org.ovirt.engine.api.model.Template; import org.ovirt.engine.api.model.VmType; - import org.ovirt.engine.core.common.businessentities.OriginType; import org.ovirt.engine.core.common.businessentities.VmTemplate; @@ -66,6 +65,7 @@ assertEquals(model.getDisplay().getType(), transform.getDisplay().getType()); assertEquals(model.getDisplay().getMonitors(), transform.getDisplay().getMonitors()); assertEquals(model.getDisplay().isAllowOverride(), transform.getDisplay().isAllowOverride()); + assertEquals(model.getDisplay().getVncKeyboardLayout(), transform.getDisplay().getVncKeyboardLayout()); assertEquals(model.getDomain().getName(), transform.getDomain().getName()); assertEquals(model.getTimezone(), transform.getTimezone()); assertEquals(model.getDisplay().isSmartcardEnabled(), transform.getDisplay().isSmartcardEnabled()); 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 a71e3fd..6fd4ccf 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 @@ -110,6 +110,7 @@ assertEquals(model.getDomain().getName(), transform.getDomain().getName()); assertEquals(model.getTimezone(), transform.getTimezone()); assertEquals(model.getDisplay().isSmartcardEnabled(), transform.getDisplay().isSmartcardEnabled()); + assertEquals(model.getDisplay().getVncKeyboardLayout(), transform.getDisplay().getVncKeyboardLayout()); assertEquals(model.isDeleteProtected(), transform.isDeleteProtected()); } -- To view, visit http://gerrit.ovirt.org/11315 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdf2b9f74d483a1be9caaa6d6a47ba8de7c37420 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Beták <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
