Juan Hernandez has uploaded a new change for review. Change subject: restapi: Rename allow_reconnect to allow_override ......................................................................
restapi: Rename allow_reconnect to allow_override Several people have expressed their preference for allow_override instead allow_reconnect in the name of the property that defines if a user can connecto to a display when there is already another user connected. Change-Id: Ida77e6591f6108c2d3c0a36fbec35f64f94ac32b Bug-Url: https://bugzilla.redhat.com/856512 Signed-off-by: Juan Hernandez <[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_v-3.1.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, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/8325/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 d127bdd..8fe2b99 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 @@ -1824,7 +1824,7 @@ <xs:element name="port" type="xs:unsignedShort" minOccurs="0" maxOccurs="1"/> <xs:element name="secure_port" type="xs:unsignedShort" minOccurs="0" maxOccurs="1"/> <xs:element name="monitors" type="xs:int" minOccurs="0" maxOccurs="1"/> - <xs:element name="allow_reconnect" type="xs:boolean" minOccurs="0" maxOccurs="1"/> + <xs:element name="allow_override" type="xs:boolean" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml index 99561f4..21de65e 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml @@ -51,7 +51,7 @@ vm.os.initRd: xs:string vm.display.monitors: xs:int vm.display.type: xs:string - vm.display.allow_reconnect: xs:boolean + vm.display.allow_override: xs:boolean vm.os.cmdline: xs:string vm.cpu.topology.cores: xs:int vm.memory: xs:long @@ -89,7 +89,7 @@ vm.os.initRd: xs:string vm.display.monitors: xs:int vm.display.type: xs:string - vm.display.allow_reconnect: xs:boolean + vm.display.allow_override: xs:boolean vm.os.cmdline: xs:string vm.cpu.topology.cores: xs:int vm.memory: xs:long @@ -1987,7 +1987,7 @@ template.os.kernel: xs:string template.display.type: xs:string template.display.monitors: xs:int - template.display.allow_reconnect: xs:boolean + template.display.allow_override: xs:boolean template.os.initRd: xs:string template.usb.enabled: xs:boolean template.usb.type: xs:string @@ -2021,7 +2021,7 @@ template.os.kernel: xs:string template.display.type: xs:string template.display.monitors: xs:int - template.display.allow_reconnect: xs:boolean + template.display.allow_override: xs:boolean 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 e5af196..fcf5301 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 @@ -105,8 +105,8 @@ if (model.getDisplay().isSetMonitors()) { entity.setnum_of_monitors(model.getDisplay().getMonitors()); } - if (model.getDisplay().isSetAllowReconnect()) { - entity.setAllowConsoleReconnect(model.getDisplay().isAllowReconnect()); + if (model.getDisplay().isSetAllowOverride()) { + entity.setAllowConsoleReconnect(model.getDisplay().isAllowOverride()); } } if (model.isSetDomain() && model.getDomain().isSetName()) { @@ -197,8 +197,8 @@ if (model.getDisplay().isSetMonitors()) { staticVm.setnum_of_monitors(model.getDisplay().getMonitors()); } - if (model.getDisplay().isSetAllowReconnect()) { - staticVm.setAllowConsoleReconnect(model.getDisplay().isAllowReconnect()); + if (model.getDisplay().isSetAllowOverride()) { + staticVm.setAllowConsoleReconnect(model.getDisplay().isAllowOverride()); } } if (model.isSetDomain() && model.getDomain().isSetName()) { @@ -266,7 +266,7 @@ model.setDisplay(new Display()); model.getDisplay().setType(VmMapper.map(entity.getdefault_display_type(), null)); model.getDisplay().setMonitors(entity.getnum_of_monitors()); - model.getDisplay().setAllowReconnect(entity.getAllowConsoleReconnect()); + model.getDisplay().setAllowOverride(entity.getAllowConsoleReconnect()); } if (entity.getcreation_date() != null) { model.setCreationTime(DateMapper.map(entity.getcreation_date(), 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 6d36068..18ef9ca 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 @@ -184,8 +184,8 @@ if (vm.getDisplay().isSetMonitors()) { staticVm.setnum_of_monitors(vm.getDisplay().getMonitors()); } - if (vm.getDisplay().isSetAllowReconnect()) { - staticVm.setAllowConsoleReconnect(vm.getDisplay().isAllowReconnect()); + if (vm.getDisplay().isSetAllowOverride()) { + staticVm.setAllowConsoleReconnect(vm.getDisplay().isAllowOverride()); } } if (vm.isSetPlacementPolicy() && vm.getPlacementPolicy().isSetAffinity()) { @@ -322,7 +322,7 @@ Integer displaySecurePort = entity.getdisplay_secure_port(); model.getDisplay().setSecurePort(displaySecurePort==null || displaySecurePort==-1 ? null : displaySecurePort); model.getDisplay().setMonitors(entity.getnum_of_monitors()); - model.getDisplay().setAllowReconnect(entity.getAllowConsoleReconnect()); + model.getDisplay().setAllowOverride(entity.getAllowConsoleReconnect()); } model.setType(map(entity.getvm_type(), null)); model.setStateless(entity.getis_stateless()); 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 9554846..01c5b08 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 @@ -65,7 +65,7 @@ assertNotNull(model.getDisplay()); assertEquals(model.getDisplay().getType(), transform.getDisplay().getType()); assertEquals(model.getDisplay().getMonitors(), transform.getDisplay().getMonitors()); - assertEquals(model.getDisplay().isAllowReconnect(), transform.getDisplay().isAllowReconnect()); + assertEquals(model.getDisplay().isAllowOverride(), transform.getDisplay().isAllowOverride()); assertEquals(model.getDomain().getName(), transform.getDomain().getName()); assertEquals(model.getTimezone(), transform.getTimezone()); assertEquals(model.getUsb().isEnabled(), transform.getUsb().isEnabled()); 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 82b942e..0dc377b 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 @@ -97,7 +97,7 @@ assertEquals(model.isSetDisplay(), transform.isSetDisplay()); assertEquals(model.getDisplay().getType(), transform.getDisplay().getType()); assertEquals(model.getDisplay().getMonitors(), transform.getDisplay().getMonitors()); - assertEquals(model.getDisplay().isAllowReconnect(), transform.getDisplay().isAllowReconnect()); + assertEquals(model.getDisplay().isAllowOverride(), transform.getDisplay().isAllowOverride()); assertEquals(model.getPlacementPolicy().getHost().getId(), transform.getPlacementPolicy().getHost().getId()); assertTrue(Math.abs(model.getMemoryPolicy().getGuaranteed() - transform.getMemoryPolicy().getGuaranteed()) <= (1024 * 1024)); assertEquals(model.getDomain().getName(), transform.getDomain().getName()); -- To view, visit http://gerrit.ovirt.org/8325 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida77e6591f6108c2d3c0a36fbec35f64f94ac32b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
