[Engine-patches] Change in ovirt-engine[master]: restapi: Introduction of new TimeZone Complex Type

[vfeenstr]

Vinzenz Feenstra has uploaded a new change for review.

Change subject: restapi: Introduction of new TimeZone Complex Type
......................................................................

restapi: Introduction of new TimeZone Complex Type

This patch introduces a new complex type TimeZone.
This complex type contains the name and the utc standard time zone offset.

Change-Id: I5ac16620c3de15597e284f8674cbf2984d2e646b
Signed-off-by: Vinzenz Feenstra <vfeen...@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/VmBaseMapper.java
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/42150/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 7f09316..2dcfa64 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
@@ -3303,6 +3303,13 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="TimeZone">
+    <xs:sequence>
+      <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="utc_offset" type="xs:int" minOccurs="1" maxOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="GuestInfo">
     <xs:sequence>
       <xs:element ref="ips" minOccurs="0" maxOccurs="1"/>
@@ -3379,6 +3386,7 @@
           <xs:element name="custom_emulated_machine" type="xs:string" 
minOccurs="0" maxOccurs="1"/>
           <xs:element name="custom_cpu_model" type="xs:string" minOccurs="0" 
maxOccurs="1"/>
           <xs:element name="graphics_consoles" type="GraphicsConsoles" 
minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element name="time_zone" type="TimeZone" minOccurs="0" 
maxOccurs="1"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
diff --git 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java
 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java
index 2fce71d..233dcbf 100644
--- 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java
+++ 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java
@@ -12,6 +12,7 @@
 import org.ovirt.engine.api.model.Domain;
 import org.ovirt.engine.api.model.HighAvailability;
 import org.ovirt.engine.api.model.IO;
+import org.ovirt.engine.api.model.TimeZone;
 import org.ovirt.engine.api.model.Usb;
 import org.ovirt.engine.api.model.UsbType;
 import org.ovirt.engine.api.model.VmBase;
@@ -19,8 +20,11 @@
 import org.ovirt.engine.api.restapi.utils.CustomPropertiesParser;
 import org.ovirt.engine.api.restapi.utils.GuidUtils;
 import org.ovirt.engine.api.restapi.utils.UsbMapperUtils;
+import org.ovirt.engine.core.common.TimeZoneType;
 import org.ovirt.engine.core.common.businessentities.ConsoleDisconnectAction;
 import org.ovirt.engine.core.common.businessentities.OriginType;
+import org.ovirt.engine.core.common.osinfo.OsRepository;
+import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
 
 import static 
org.ovirt.engine.api.restapi.types.IntegerMapper.mapMinusOneToNull;
 import static 
org.ovirt.engine.api.restapi.types.IntegerMapper.mapNullToMinusOne;
@@ -213,6 +217,14 @@
         model.getBios().setBootMenu(new BootMenu());
         model.getBios().getBootMenu().setEnabled(entity.isBootMenuEnabled());
 
+        final boolean isWindows = 
SimpleDependecyInjector.getInstance().get(OsRepository.class).isWindows(entity.getOsId());
+        model.setTimeZone(new TimeZone());
+        if(isWindows) {
+            
model.getTimeZone().setUtcOffset(TimeZoneType.WINDOWS_TIMEZONE.getStandardOffset(entity.getTimeZone()));
+        } else {
+            
model.getTimeZone().setUtcOffset(TimeZoneType.GENERAL_TIMEZONE.getStandardOffset(entity.getTimeZone()));
+        }
+        model.getTimeZone().setName(entity.getTimeZone());
         model.setTimezone(entity.getTimeZone());
 
         if (entity.getCreationDate() != null) {


-- 
To view, visit https://gerrit.ovirt.org/42150
To unsubscribe, visit https://gerrit.ovirt.org/settings

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