Martin Beták has uploaded a new change for review. Change subject: restapi: Added VmPool.max_assigned_vms_per_user ......................................................................
restapi: Added VmPool.max_assigned_vms_per_user Added max_assigned_vms_per_user to vmpool Change-Id: I9bbe202d92761b5ea2597ef5a87bd62cfec2a9bc Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=827248 Signed-off-by: Martin Betak <mbe...@redhat.com> --- 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/VmPoolMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmPoolMapperTest.java 4 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/14006/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 b0dc308..4e35778 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 @@ -2270,6 +2270,7 @@ <xs:element ref="cluster" minOccurs="0" maxOccurs="1"/> <xs:element ref="template" minOccurs="0" maxOccurs="1"/> <xs:element name="prestarted_vms" type="xs:int" minOccurs="0"/> + <xs:element name="max_assigned_vms_per_user" type="xs:int" minOccurs="0"/> </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 917565a..9d85bb2 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 @@ -2799,7 +2799,7 @@ signatures: - mandatoryArguments: {} optionalArguments: {vmpool.cluster.id|name: 'xs:string', vmpool.template.id|name: 'xs:string', - vmpool.name: 'xs:string', vmpool.size: 'xs:int'} + vmpool.name: 'xs:string', vmpool.size: 'xs:int', vmpool.max_assigned_vms_per_user: 'xs:int'} urlparams: {} headers: Content-Type: {value: application/xml|json, required: true} @@ -2822,7 +2822,7 @@ signatures: - mandatoryArguments: {vmpool.cluster.id|name: 'xs:string', vmpool.template.id|name: 'xs:string', vmpool.name: 'xs:string'} - optionalArguments: {vmpool.size: 'xs:int'} + optionalArguments: {vmpool.size: 'xs:int', vmpool.max_assigned_vms_per_user: 'xs:int'} urlparams: {} headers: Content-Type: {value: application/xml|json, required: true} diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmPoolMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmPoolMapper.java index 34068d4..992d628 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmPoolMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmPoolMapper.java @@ -34,6 +34,9 @@ if (model.isSetPrestartedVms()) { entity.setPrestartedVms(model.getPrestartedVms()); } + if (model.isSetMaxAssignedVmsPerUser()) { + entity.setMaxAssignedVmsPerUser(model.getMaxAssignedVmsPerUser()); + } return entity; } @@ -66,6 +69,7 @@ model.setCluster(new Cluster()); model.getCluster().setId(entity.getVdsGroupId().toString()); } + model.setMaxAssignedVmsPerUser(entity.getMaxAssignedVmsPerUser()); return model; } } diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmPoolMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmPoolMapperTest.java index 09aef8b..af2136f 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmPoolMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmPoolMapperTest.java @@ -19,5 +19,6 @@ assertEquals(model.getSize(), transform.getSize()); assertNotNull(transform.getCluster()); assertEquals(model.getCluster().getId(), transform.getCluster().getId()); + assertEquals(model.getMaxAssignedVmsPerUser(), transform.getMaxAssignedVmsPerUser()); } } -- To view, visit http://gerrit.ovirt.org/14006 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bbe202d92761b5ea2597ef5a87bd62cfec2a9bc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Beták <mbe...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
