Daniel Erez has uploaded a new change for review.
Change subject: rest: VirtIO-SCSI enabled flag
......................................................................
rest: VirtIO-SCSI enabled flag
* Added 'virtio_scsi_enabled' boolean to VM/Template resources (api.xsd).
* Set 'VirtioScsiEnabled' value in:
BackendVmResource (add VM) / BackendVmsResource (update VM)
* Updated VmMapper/TemplateMapper accordingly.
Change-Id: I481025152b20579ac615d9023ed0cef9b64558e1
Signed-off-by: Daniel Erez <de...@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/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
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
8 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/19154/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 41df119..a26c611 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
@@ -2212,6 +2212,7 @@
<xs:element ref="domain" minOccurs="0" maxOccurs="1"/>
<xs:element ref="usb" minOccurs="0" maxOccurs="1"/>
<xs:element name="tunnel_migration" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="virtio_scsi_enabled" type="xs:boolean"
minOccurs="0" maxOccurs="1"/>
<xs:element ref="permissions" minOccurs="0" maxOccurs="1"/>
<!-- also rel="cdroms/disks/nics/watchdogs" links, see Devices below
-->
</xs:sequence>
@@ -2437,6 +2438,7 @@
<xs:element ref="quota" minOccurs="0" maxOccurs="1"/>
<xs:element ref="usb" minOccurs="0" maxOccurs="1"/>
<xs:element name="tunnel_migration" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="virtio_scsi_enabled" type="xs:boolean"
minOccurs="0" maxOccurs="1"/>
<xs:element ref="permissions" minOccurs="0" maxOccurs="1"/>
<xs:element ref="vmpool" minOccurs="0" maxOccurs="1">
<xs:annotation>
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 8863d84..aef9995 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
@@ -82,6 +82,7 @@
vm.origin: xs:string
vm.os.kernel: xs:string
vm.tunnel_migration: xs:boolean
+ vm.virtio_scsi_enabled: xs:boolean
vm.payloads.payload--COLLECTION: {payload.type: 'xs:string',
payload.volume_id: 'xs:string', payload.file.name: 'xs:string',
payload.file.content: 'xs:string'}
vm.cpu.cpu_tune.vcpu_pin--COLLECTION: {vcpu_pin.vcpu: 'xs:int',
vcpu_pin.cpu_set: 'xs:string'}
description: update the virtual machine in the system for the given
virtual machine id with the values specified in the request
@@ -152,6 +153,7 @@
vm.os.kernel: xs:string
vm.disks.clone: xs:boolean
vm.tunnel_migration: xs:boolean
+ vm.virtio_scsi_enabled: xs:boolean
vm.payloads.payload--COLLECTION: {payload.type: 'xs:string',
payload.volume_id: 'xs:string', payload.file.name: 'xs:string',
payload.file.content: 'xs:string'}
vm.initialization.configuration.type: 'xs:string'
vm.initialization.configuration.data: 'xs:string'
@@ -195,6 +197,7 @@
vm.origin: xs:string
vm.os.kernel: xs:string
vm.tunnel_migration: xs:boolean
+ vm.virtio_scsi_enabled: xs:boolean
vm.payloads.payload--COLLECTION: {payload.type: 'xs:string',
payload.volume_id: 'xs:string', payload.file.name: 'xs:string',
payload.file.content: 'xs:string'}
vm.cpu.cpu_tune.vcpu_pin--COLLECTION: {vcpu_pin.vcpu: 'xs:int',
vcpu_pin.cpu_set: 'xs:string'}
description: add a virtual machine to the system by cloning from a
snapshot
@@ -236,6 +239,7 @@
vm.os.kernel: xs:string
vm.disks.clone: xs:boolean
vm.tunnel_migration: xs:boolean
+ vm.virtio_scsi_enabled: xs:boolean
vm.payloads.payload--COLLECTION: {payload.type: 'xs:string',
payload.volume_id: 'xs:string', payload.file.name: 'xs:string',
payload.file.content: 'xs:string'}
vm.initialization.configuration.type: 'xs:string'
vm.initialization.configuration.data: 'xs:string'
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
index 72f019b..c1b474c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
@@ -387,6 +387,9 @@
if (incoming.isSetConsole() &&
incoming.getConsole().isSetEnabled()) {
params.setConsoleEnabled(incoming.getConsole().isEnabled());
}
+ if (incoming.isSetVirtioScsiEnabled() &&
incoming.isVirtioScsiEnabled()) {
+ params.setVirtioScsiEnabled(incoming.isVirtioScsiEnabled());
+ }
return params;
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
index 8304f79..42f51e6 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
@@ -321,6 +321,7 @@
params.setStorageDomainId(storageDomainId);
params.setDiskInfoDestinationMap(getDisksToClone(vm.getDisks(),
templateId));
params.setMakeCreatorExplicitOwner(shouldMakeCreatorExplicitOwner());
+ params.setVirtioScsiEnabled(vm.isVirtioScsiEnabled());
setupCloneTemplatePermissions(vm, params);
params.setConsoleEnabled(vm.isSetConsole() &&
vm.getConsole().isSetEnabled()
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 65555d4..27f3548 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
@@ -137,6 +137,9 @@
if (model.isSetTunnelMigration()) {
entity.setTunnelMigration(model.isTunnelMigration());
}
+ if (model.isSetVirtioScsiEnabled()) {
+ entity.setVirtioScsiEnabled(model.isVirtioScsiEnabled());
+ }
return entity;
}
@@ -248,6 +251,9 @@
if (model.isSetTunnelMigration()) {
staticVm.setTunnelMigration(model.isTunnelMigration());
}
+ if (model.isSetVirtioScsiEnabled()) {
+ staticVm.setVirtioScsiEnabled(model.isVirtioScsiEnabled());
+ }
return staticVm;
}
@@ -330,6 +336,7 @@
}
model.setTimezone(entity.getTimeZone());
model.setTunnelMigration(entity.getTunnelMigration());
+ model.setVirtioScsiEnabled(entity.isVirtioScsiEnabled());
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 6416210..c9cb7d6 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
@@ -104,6 +104,7 @@
staticVm.setUsbPolicy(entity.getUsbPolicy());
staticVm.setTunnelMigration(entity.getTunnelMigration());
staticVm.setVncKeyboardLayout(entity.getVncKeyboardLayout());
+ staticVm.setVirtioScsiEnabled(entity.isVirtioScsiEnabled());
return staticVm;
}
@@ -448,6 +449,7 @@
model.setQuota(quota);
}
model.setTunnelMigration(entity.getTunnelMigration());
+ model.setVirtioScsiEnabled(entity.isVirtioScsiEnabled());
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 d206616..6750ada 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
@@ -79,5 +79,6 @@
assertEquals(model.getDisplay().isSmartcardEnabled(),
transform.getDisplay().isSmartcardEnabled());
assertEquals(model.isDeleteProtected(), transform.isDeleteProtected());
assertEquals(model.isTunnelMigration(), transform.isTunnelMigration());
+ assertEquals(model.isVirtioScsiEnabled(),
transform.isVirtioScsiEnabled());
}
}
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 08bdc43..d566820 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
@@ -124,6 +124,7 @@
assertEquals(model.getDisplay().getKeyboardLayout(),
transform.getDisplay().getKeyboardLayout());
assertEquals(model.isDeleteProtected(), transform.isDeleteProtected());
assertEquals(model.isTunnelMigration(), transform.isTunnelMigration());
+ assertEquals(model.isVirtioScsiEnabled(),
transform.isVirtioScsiEnabled());
}
@Test
--
To view, visit http://gerrit.ovirt.org/19154
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I481025152b20579ac615d9023ed0cef9b64558e1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
