[Engine-patches] Change in ovirt-engine[master]: restapi: RFE: add smartcard support

[tjelinek]

Tomas Jelinek has uploaded a new change for review.

Change subject: restapi: RFE: add smartcard support
......................................................................

restapi: RFE: add smartcard support

Added boolean flag "smartcardEnabled" to
VM and template

Change-Id: Ibddf2c606e80cd951fc5d82bc0413d96610f451a
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M 
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
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
3 files changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/8512/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 94cad8e..65fb10e 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
@@ -1825,6 +1825,7 @@
       <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_override" type="xs:boolean" minOccurs="0" 
maxOccurs="1"/>
+      <xs:element name="smartcardEnabled" type="xs:boolean" minOccurs="0" 
maxOccurs="1"/>
     </xs:sequence>
   </xs:complexType>
 
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 fcf5301..6dbfbb2 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
@@ -108,6 +108,9 @@
             if (model.getDisplay().isSetAllowOverride()) {
                 
entity.setAllowConsoleReconnect(model.getDisplay().isAllowOverride());
             }
+            if (model.getDisplay().isSetSmartcardEnabled()) {
+                
entity.setSmartcardEnabled(model.getDisplay().isSmartcardEnabled());
+            }
         }
         if (model.isSetDomain() && model.getDomain().isSetName()) {
             entity.setdomain(model.getDomain().getName());
@@ -200,6 +203,9 @@
             if (model.getDisplay().isSetAllowOverride()) {
                 
staticVm.setAllowConsoleReconnect(model.getDisplay().isAllowOverride());
             }
+            if (model.getDisplay().isSmartcardEnabled()) {
+                
staticVm.setSmartcardEnabled(model.getDisplay().isSmartcardEnabled());
+            }
         }
         if (model.isSetDomain() && model.getDomain().isSetName()) {
             staticVm.setdomain(model.getDomain().getName());
@@ -267,6 +273,7 @@
             
model.getDisplay().setType(VmMapper.map(entity.getdefault_display_type(), 
null));
             model.getDisplay().setMonitors(entity.getnum_of_monitors());
             
model.getDisplay().setAllowOverride(entity.getAllowConsoleReconnect());
+            
model.getDisplay().setSmartcardEnabled(entity.isSmartcardEnabled());
         }
         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 18ef9ca..8bd7f88 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
@@ -78,6 +78,7 @@
         staticVm.setfail_back(entity.getfail_back());
         staticVm.setauto_startup(entity.getauto_startup());
         staticVm.setis_stateless(entity.getis_stateless());
+        staticVm.setSmartcardEnabled(entity.isSmartcardEnabled());
         staticVm.setauto_startup(entity.getauto_startup());
         staticVm.setdefault_boot_sequence(entity.getdefault_boot_sequence());
         staticVm.setvm_type(entity.getvm_type());
@@ -186,6 +187,9 @@
             }
             if (vm.getDisplay().isSetAllowOverride()) {
                 
staticVm.setAllowConsoleReconnect(vm.getDisplay().isAllowOverride());
+            }
+            if (vm.getDisplay().isSetSmartcardEnabled()) {
+                
staticVm.setSmartcardEnabled(vm.getDisplay().isSmartcardEnabled());
             }
         }
         if (vm.isSetPlacementPolicy() && 
vm.getPlacementPolicy().isSetAffinity()) {
@@ -323,6 +327,7 @@
             model.getDisplay().setSecurePort(displaySecurePort==null || 
displaySecurePort==-1 ? null : displaySecurePort);
             model.getDisplay().setMonitors(entity.getnum_of_monitors());
             
model.getDisplay().setAllowOverride(entity.getAllowConsoleReconnect());
+            
model.getDisplay().setSmartcardEnabled(entity.isSmartcardEnabled());
         }
         model.setType(map(entity.getvm_type(), null));
         model.setStateless(entity.getis_stateless());


--
To view, visit http://gerrit.ovirt.org/8512
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibddf2c606e80cd951fc5d82bc0413d96610f451a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches