opennebula-cli 6.6.3 → 6.8.0

data/lib/one_helper.rb

@@ -17,6 +17,8 @@
 require 'cli_helper'
 require 'open3'
 require 'io/console'
+require 'time'
+require 'io/wait'
 
 begin
     require 'opennebula'
@@ -48,6 +50,9 @@ module OpenNebulaHelper
 
     EDITOR_PATH='/usr/bin/vi'
 
+    TEMPLATE_INPUT = 'A template can be passed as a file with or the content via STDIN
+Bash symbols must be escaped on STDIN passing'
+
     ########################################################################
     # Options
     ########################################################################
@@ -102,6 +107,22 @@ module OpenNebulaHelper
         :description => 'Append new attributes to the current template'
     }
 
+    FILE = {
+        :name => 'file',
+        :short => '-f file',
+        :large => '--file file',
+        :description => 'Selects the template file',
+        :format => String,
+        :proc => lambda {|o, options|
+            if File.file?(o)
+                options[:file] = o
+            else
+                STDERR.puts "File `#{options[:file]}` doesn't exist"
+                exit(-1)
+            end
+        }
+    }
+
     # Command line VM template options
     TEMPLATE_NAME_VM={
         :name   => 'name',
@@ -418,6 +439,59 @@ module OpenNebulaHelper
                 options[:user_inputs] = o.join("\n")
             end
         },
+        {
+            :name   => 'video',
+            :large  => '--video type',
+            :format => String,
+            :description => 'Add a custom video device (none, vga, cirrus, virtio)'
+        },
+        {
+            :name   => 'video_iommu',
+            :large  => '--video-iommu',
+            :description => 'Enable IOMMU (I/O Memory Management Unit) for the video device'
+        },
+        {
+            :name   => 'video_ats',
+            :large  => '--video-ats',
+            :description => 'Enable ATS (Address Translation Services) for the video device'
+        },
+        {
+            :name   => 'video_vram',
+            :large  => '--video-vram vram',
+            :description => 'VRAM allocated to the video device. By default the ' +
+                "unit is megabytes. To use gigabytes add a 'g', floats " +
+                'can be used: 8g=8192, 0.5g=512',
+            :format => String,
+            :proc   => lambda do |o, _options|
+                m=o.strip.match(/^(\d+(?:\.\d+)?)(m|mb|g|gb)?$/i)
+
+                if !m
+                    [-1, 'VRAM value malformed']
+                else
+                    multiplier=case m[2]
+                               when /(g|gb)/i
+                                   1048576 # = 1024 * 1024
+                               else
+                                   1024
+                               end
+
+                    value=m[1].to_f*multiplier
+
+                    [0, value.floor]
+                end
+            end
+        },
+        {
+            :name   => 'video_resolution',
+            :large  => '--video-resolution resolution',
+            :format => String,
+            :description => 'Video resolution, in format like: 1280x720 or 1920x1080',
+            :proc   => lambda do |_o, _options|
+                if !m.match?(/\d{3,4}x\d{3,4}/)
+                    [-1, 'Video Resolution value malformed']
+                end
+            end
+        },
         AS_GROUP,
         AS_USER
     ]
@@ -440,6 +514,73 @@ module OpenNebulaHelper
         :description => 'Get decrypted attributes'
     }
 
+    SCHEDULE_OPTIONS=[
+        SCHEDULE = {
+            :name => 'schedule',
+            :large => '--schedule TIME',
+            :description => 'Schedules this action to be executed after' \
+            'the given time. For example: onevm resume 0 --schedule "09/23 14:15"',
+            :format => String,
+            :proc => lambda {|o, options|
+                if o[0] == '+'
+                    options[:schedule] = o
+                elsif o == 'now'
+                    options[:schedule] = Time.now.to_i
+                else
+                    begin
+                        options[:schedule] = Time.parse(o).to_i
+                    rescue StandardError
+                        STDERR.puts "Error parsing time spec: #{o}"
+                        exit(-1)
+                    end
+                end
+            }
+        },
+
+        WEEKLY = {
+            :name => 'weekly',
+            :large => '--weekly days',
+            :description => 'Repeats the schedule action the days of the week ' \
+            'specified, it can be a number between 0 (Sunday) to 6 (Saturday) ' \
+            'separated with commas. ' \
+            'For example: onevm resume 0 --schedule "09/23 14:15" --weekly 0,2,4',
+            :format => String
+        },
+
+        MONTHLY = {
+            :name => 'monthly',
+            :large => '--monthly days',
+            :description => 'Repeats the schedule action the days of the month ' \
+            'specified, it can be a number between 1,31 separated with commas. ' \
+            'For example: onevm resume 0 --schedule "09/23 14:15" --monthly 1,14',
+            :format => String
+        },
+
+        YEARLY = {
+            :name => 'yearly',
+            :large => '--yearly days',
+            :description => 'Repeats the schedule action the days of the year ' \
+            'specified, it can be a number between 0,365 separated with commas. ' \
+            'For example: onevm resume 0 --schedule "09/23 14:15" --yearly 30,60',
+            :format => String
+        },
+
+        HOURLY = {
+            :name => 'hourly',
+            :large => '--hourly hour',
+            :description => 'Repeats the schedule action with the given hourly frequency. ' \
+            'For example (every 5 hours): onevm resume 0 --schedule "09/23 14:15" --hourly 5',
+            :format => Numeric
+        },
+
+        END_TIME = {
+            :name => 'end',
+            :large => '--end number|TIME',
+            :description => '----',
+            :format => String
+        }
+    ]
+
     TEMPLATE_OPTIONS_VM   = [TEMPLATE_NAME_VM] + TEMPLATE_OPTIONS + [DRY]
 
     CAPACITY_OPTIONS_VM   = [TEMPLATE_OPTIONS[0], TEMPLATE_OPTIONS[1],
@@ -546,6 +687,10 @@ module OpenNebulaHelper
             "The default columns and their layout can be configured in #{conf_file}"
         end
 
+        def self.template_input_help(object_name)
+            "#{TEMPLATE_INPUT}\nWhen using a template add only one #{object_name} instance."
+        end
+
         def initialize(_secret = nil, _endpoint = nil)
             @client=nil
 
@@ -1260,6 +1405,7 @@ module OpenNebulaHelper
         #
         # @return [Hash] XSD in hash format, nil if not found
         def read_xsd(ename)
+            require 'active_support'
             require 'active_support/core_ext/hash/conversions'
 
             # Try GEM directory
@@ -1556,6 +1702,8 @@ module OpenNebulaHelper
     def self.update_template_helper(append, _id, resource, path, xpath, update = true)
         if path
             File.read(path)
+        elsif STDIN.wait_readable(0)
+            STDIN.read
         elsif append
             editor_input
         else
@@ -1831,6 +1979,15 @@ module OpenNebulaHelper
             template<<' ]' << "\n"
         end
 
+        if options[:video]
+            template<<"VIDEO=[ TYPE=\"#{options[:video]}\""
+            template<<', IOMMU="YES"' if options[:video_iommu]
+            template<<', ATS="YES"' if options[:video_ats]
+            template<<", VRAM=\"#{options[:video_vram]}\"" if options[:video_vram]
+            template<<", RESOLUTION=\"#{options[:video_resolution]}\""
+            template<<' ]' << "\n"
+        end
+
         template<<"VCENTER_VM_FOLDER=#{options[:vcenter_vm_folder]}\n" if options[:vcenter_vm_folder]
 
         context=create_context(options)
@@ -2349,4 +2506,148 @@ module OpenNebulaHelper
         end
     end
 
+    def self.schedule_action_tmpl(options, action, warning = nil)
+        str_periodic = ''
+
+        if options.key?(:weekly)
+            str_periodic << ", REPEAT = 0, DAYS = \"#{options[:weekly]}\""
+        elsif options.key?(:monthly)
+            str_periodic << ", REPEAT = 1, DAYS = \"#{options[:monthly]}\""
+        elsif options.key?(:yearly)
+            str_periodic << ", REPEAT = 2, DAYS = \"#{options[:yearly]}\""
+        elsif options.key?(:hourly)
+            str_periodic << ", REPEAT = 3, DAYS = \"#{options[:hourly]}\""
+        end
+
+        if options.key?(:end)
+            begin
+                end_date = Date.parse(options[:end])
+                str_periodic << ", END_TYPE = 2, END_VALUE = #{end_date.to_time.to_i}"
+            rescue ArgumentError
+                if options[:end].to_i > 0
+                    str_periodic << ", END_TYPE = 1, END_VALUE = #{options[:end].to_i}"
+                end
+            end
+        elsif str_periodic != ''
+            str_periodic << ', END_TYPE = 0'
+        end
+
+        tmp_str = 'SCHED_ACTION = ['
+        tmp_str << "ACTION  = #{action}, " if action
+        tmp_str << "WARNING = #{warning}," if warning
+        tmp_str << "ARGS    = \"#{options[:args]}\"," if options[:args]
+        tmp_str << "TIME    = #{options[:schedule]}"
+        tmp_str << str_periodic << ']'
+
+        tmp_str
+    end
+
+    def self.scheduled_action_table(object)
+        CLIHelper::ShowTable.new(nil, object) do
+            column :ID, '', :adjust => true do |d|
+                d['ID']
+            end
+
+            column :ACTION, '', :adjust => true do |d|
+                d['ACTION']
+            end
+
+            column :ARGS, '', :adjust => true do |d|
+                d['ARGS'] && !d['ARGS'].empty? ? d['ARGS'] : '-'
+            end
+
+            column :SCHEDULED, '', :adjust => true do |d|
+                t = d['TIME'].to_i
+
+                # relative action for VMs
+                if d['TIME'] !~ /^[0-9].*/ && !object['STIME'].nil?
+                    t += object['STIME'].to_i
+                end
+
+                OpenNebulaHelper.time_to_str(t, false) unless d.nil?
+            end
+
+            column :REPEAT, '', :adjust => true do |d|
+                begin
+                    str_rep = ''
+
+                    case d['REPEAT']
+                    when '0'
+                        str_rep << 'Weekly '
+                    when '1'
+                        str_rep << 'Monthly '
+                    when '2'
+                        str_rep << 'Yearly '
+                    when '3'
+                        str_rep << 'Each ' << d['DAYS'] << ' hours'
+                    end
+
+                    if d['REPEAT'] != '3'
+                        str_rep << d['DAYS']
+                    end
+
+                    str_rep
+                rescue StandardError
+                    ''
+                end
+            end
+
+            column :END, '', :adjust => true do |d|
+                begin
+                    str_end = ''
+
+                    case d['END_TYPE']
+                    when '0'
+                        str_end << 'None'
+                    when '1'
+                        str_end << 'After ' << d['END_VALUE'] << ' times'
+                    when '2'
+                        str_end << 'On ' << \
+                            OpenNebulaHelper.time_to_str(d['END_VALUE'], false, false, true)
+                    end
+
+                    str_end
+                rescue StandardError
+                    ''
+                end
+            end
+
+            column :STATUS, '', :left, :size => 50 do |d|
+                begin
+                    if d['DONE'].to_i > 0 && d['REPEAT'].to_i < 0
+                        "Done on #{OpenNebulaHelper.time_to_str(d['DONE'], false)}"
+                    elsif d['MESSAGE'] && !d['MESSAGE'].empty?
+                        "Error! #{d['MESSAGE']}"
+                    else
+                        t1 = Time.now
+                        t2 = d['TIME'].to_i
+
+                        # relative action for VMs
+                        if (d['TIME'] !~ /^[0-9].*/) && !object['STIME'].nil?
+                            t2 += object['STIME'].to_i
+                        end
+
+                        t2 = Time.at(t2)
+
+                        days    = ((t2 - t1) / (24 * 3600)).round(2)
+                        hours   = ((t2 - t1) / 3600).round(2)
+                        minutes = ((t2 - t1) / 60).round(2)
+
+                        if days > 1
+                            "Next in #{days} days"
+                        elsif days <= 1 && hours > 1
+                            "Next in #{hours} hours"
+                        elsif minutes > 0
+                            "Next in #{minutes} minutes"
+                        else
+                            'Overdue!'
+                        end
+                    end
+                rescue StandardError
+                    ''
+                end
+            end
+        end
+    end
+
 end

data/share/schemas/xsd/acct.xsd

@@ -124,25 +124,8 @@
               <xs:element name="STIME" type="xs:integer"/>
               <xs:element name="ETIME" type="xs:integer"/>
               <xs:element name="DEPLOY_ID" type="xs:string"/>
-              <xs:element name="MONITORING">
-              <!--
-                <xs:complexType>
-                  <xs:all>
-                    <- Percentage of 1 CPU consumed (two fully consumed cpu is 200) ->
-                    <xs:element name="CPU" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
-
-                    <- MEMORY consumption in kilobytes ->
-                    <xs:element name="MEMORY" type="xs:integer" minOccurs="0" maxOccurs="1"/>
-
-                    <- NETTX: Sent bytes to the network ->
-                    <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
-
-                    <- NETRX: Received bytes from the network ->
-                    <xs:element name="NETRX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
-                  </xs:all>
-                </xs:complexType>
-              -->
-              </xs:element>
+              <xs:element name="MONITORING"/>
+              <xs:element name="SCHED_ACTIONS" type="xs:anyType"/>
               <xs:element name="TEMPLATE" type="xs:anyType"/>
               <xs:element name="USER_TEMPLATE" type="xs:anyType"/>
               <xs:element name="HISTORY_RECORDS">

data/share/schemas/xsd/backupjob.xsd

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:include schemaLocation="shared.xsd"/>
+  <xs:element name="BACKUPJOB">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="ID" type="xs:integer"/>
+        <xs:element name="UID" type="xs:integer"/>
+        <xs:element name="GID" type="xs:integer"/>
+        <xs:element name="UNAME" type="xs:string"/>
+        <xs:element name="GNAME" type="xs:string"/>
+        <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="LOCK" type="LOCK" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
+        <xs:element name="PRIORITY" type="xs:integer"/>
+        <xs:element name="LAST_BACKUP_TIME" type="xs:integer"/>
+        <xs:element name="LAST_BACKUP_DURATION" type="xs:integer"/>
+        <xs:element name="SCHED_ACTIONS" type="IDS"/>
+        <xs:element name="UPDATED_VMS" type="IDS"/>
+        <xs:element name="OUTDATED_VMS" type="IDS"/>
+        <xs:element name="BACKING_UP_VMS" type="IDS"/>
+        <xs:element name="ERROR_VMS" type="IDS"/>
+        <xs:element name="TEMPLATE">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="BACKUP_VMS" type="xs:string"/>
+              <xs:element name="BACKUP_VOLATILE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="DATASTORE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="EXECUTION" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="FS_FREEZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="KEEP_LAST" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="MODE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="RESET" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="SCHED_ACTION" type="SCHED_ACTION" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

data/share/schemas/xsd/backupjob_pool.xsd

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:include schemaLocation="backupjob.xsd"/>
+  <xs:element name="BACKUPJOB_POOL">
+    <xs:complexType>
+      <xs:sequence maxOccurs="1" minOccurs="1">
+        <xs:element ref="BACKUPJOB" maxOccurs="unbounded" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

data/share/schemas/xsd/index.xsd

@@ -4,6 +4,8 @@
     <xs:include schemaLocation="acct.xsd"/>
     <xs:include schemaLocation="acl_pool.xsd"/>
     <xs:include schemaLocation="api_info.xsd"/>
+    <xs:include schemaLocation="backupjob_pool.xsd"/>
+    <xs:include schemaLocation="backupjob.xsd"/>
     <xs:include schemaLocation="cluster_pool.xsd"/>
     <xs:include schemaLocation="cluster.xsd"/>
     <xs:include schemaLocation="datastore_pool.xsd"/>
@@ -28,6 +30,7 @@
     <xs:include schemaLocation="raftstatus.xsd"/>
     <xs:include schemaLocation="security_group_pool.xsd"/>
     <xs:include schemaLocation="security_group.xsd"/>
+    <xs:include schemaLocation="shared.xsd"/>
     <xs:include schemaLocation="showback.xsd"/>
     <xs:include schemaLocation="user_pool.xsd"/>
     <xs:include schemaLocation="user.xsd"/>

data/share/schemas/xsd/opennebula_configuration.xsd

@@ -244,6 +244,8 @@
           </xs:complexType>
         </xs:element>
 
+        <xs:element name="MAX_BACKUPS" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="MAX_BACKUPS_HOST" type="xs:integer" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MAX_CONN" type="xs:integer" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MAX_CONN_BACKLOG" type="xs:integer" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MESSAGE_SIZE" type="xs:integer" minOccurs="0" maxOccurs="1"/>
@@ -293,6 +295,7 @@
               <xs:element name="CLONE_TARGET" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="CLONE_TARGET_SHARED" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="CLONE_TARGET_SSH" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="DISK_TYPE" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="DISK_TYPE_SHARED" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="DISK_TYPE_SSH" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="DRIVER" type="xs:string" minOccurs="0" maxOccurs="1"/>

data/share/schemas/xsd/shared.xsd

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:complexType name="LOCK">
+    <xs:sequence>
+      <xs:element name="LOCKED" type="xs:integer"/>
+      <xs:element name="OWNER" type="xs:integer"/>
+      <xs:element name="TIME" type="xs:integer"/>
+      <xs:element name="REQ_ID" type="xs:integer"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="PERMISSIONS">
+    <xs:sequence>
+      <xs:element name="OWNER_U" type="xs:integer"/>
+      <xs:element name="OWNER_M" type="xs:integer"/>
+      <xs:element name="OWNER_A" type="xs:integer"/>
+      <xs:element name="GROUP_U" type="xs:integer"/>
+      <xs:element name="GROUP_M" type="xs:integer"/>
+      <xs:element name="GROUP_A" type="xs:integer"/>
+      <xs:element name="OTHER_U" type="xs:integer"/>
+      <xs:element name="OTHER_M" type="xs:integer"/>
+      <xs:element name="OTHER_A" type="xs:integer"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="IDS">
+    <xs:sequence>
+      <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="SCHED_ACTION">
+    <xs:sequence>
+      <xs:element name="ID" type="xs:integer"/>
+      <xs:element name="PARENT_ID" type="xs:integer"/>
+      <xs:element name="TYPE" type="xs:string"/>
+      <xs:element name="ACTION" type="xs:string"/>
+      <xs:element name="ARGS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="TIME" type="xs:string"/>
+      <xs:element name="REPEAT" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="DAYS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="END_TYPE" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="END_VALUE" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="DONE" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="MESSAGE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>

data/share/schemas/xsd/vm.xsd

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
   targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:include schemaLocation="shared.xsd"/>
   <xs:element name="VM">
     <xs:complexType>
       <xs:sequence>
@@ -10,21 +11,7 @@
         <xs:element name="UNAME" type="xs:string"/>
         <xs:element name="GNAME" type="xs:string"/>
         <xs:element name="NAME" type="xs:string"/>
-        <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="OWNER_U" type="xs:integer"/>
-              <xs:element name="OWNER_M" type="xs:integer"/>
-              <xs:element name="OWNER_A" type="xs:integer"/>
-              <xs:element name="GROUP_U" type="xs:integer"/>
-              <xs:element name="GROUP_M" type="xs:integer"/>
-              <xs:element name="GROUP_A" type="xs:integer"/>
-              <xs:element name="OTHER_U" type="xs:integer"/>
-              <xs:element name="OTHER_M" type="xs:integer"/>
-              <xs:element name="OTHER_A" type="xs:integer"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
+        <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
         <xs:element name="LAST_POLL" type="xs:integer"/>
 
         <!-- STATE and LCM_STATE values,
@@ -38,16 +25,7 @@
         <xs:element name="STIME" type="xs:integer"/>
         <xs:element name="ETIME" type="xs:integer"/>
         <xs:element name="DEPLOY_ID" type="xs:string"/>
-        <xs:element name="LOCK" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="LOCKED" type="xs:integer"/>
-              <xs:element name="OWNER" type="xs:integer"/>
-              <xs:element name="TIME" type="xs:integer"/>
-              <xs:element name="REQ_ID" type="xs:integer"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
+        <xs:element name="LOCK" type="LOCK" minOccurs="0" maxOccurs="1"/>
         <xs:element name="MONITORING">
           <xs:complexType>
             <xs:sequence>
@@ -91,6 +69,7 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="SCHED_ACTIONS" type="IDS"/>
         <xs:element name="TEMPLATE">
           <xs:complexType>
             <xs:sequence>
@@ -116,6 +95,17 @@
               <xs:element name="FEATURES" minOccurs="0" maxOccurs="1"/>
               <xs:element name="HYPERV_OPTIONS" minOccurs="0" maxOccurs="1"/>
               <xs:element name="GRAPHICS" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VIDEO" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="TYPE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="IOMMU" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="ATS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="VRAM" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="RESOLUTION" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
               <xs:element name="IMPORTED" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="INPUT" minOccurs="0" maxOccurs="1"/>
               <xs:element name="MEMORY" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -152,21 +142,6 @@
               <xs:element name="OS" minOccurs="0" maxOccurs="1"/>
               <xs:element name="PCI" minOccurs="0" maxOccurs="1"/>
               <xs:element name="RAW" minOccurs="0" maxOccurs="1"/>
-              <xs:element name="SCHED_ACTION" minOccurs="0" maxOccurs="unbounded">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="ACTION" type="xs:string"/>
-                    <xs:element name="ARGS" type="xs:string" minOccurs="0" maxOccurs="1"/>
-                    <xs:element name="DAYS" type="xs:string" minOccurs="0" maxOccurs="1"/>
-                    <xs:element name="END_TYPE" type="xs:string" minOccurs="0" maxOccurs="1"/>
-                    <xs:element name="END_VALUE" type="xs:string" minOccurs="0" maxOccurs="1"/>
-                    <xs:element name="ID" type="xs:string"/>
-                    <xs:element name="REPEAT" type="xs:string" minOccurs="0" maxOccurs="1"/>
-                    <xs:element name="TIME" type="xs:string"/>
-                    <xs:element name="WARNING" type="xs:string"/>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
               <xs:element name="SECURITY_GROUP_RULE" minOccurs="0" maxOccurs="unbounded"/>
               <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
@@ -193,6 +168,7 @@
               <xs:element name="VROUTER_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="VROUTER_KEEPALIVED_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="VROUTER_KEEPALIVED_PASSWORD" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="SCHED_ACTION" type="SCHED_ACTION" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -319,6 +295,7 @@
               <xs:element name="BACKUP_CONFIG" minOccurs="1" maxOccurs="1">
                 <xs:complexType>
                   <xs:sequence>
+                    <xs:element name="BACKUP_JOB_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="BACKUP_VOLATILE" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="FS_FREEZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="INCREMENTAL_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -331,13 +308,7 @@
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
-              <xs:element name="BACKUP_IDS" minOccurs="1" maxOccurs="1">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="ID" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
+              <xs:element name="BACKUP_IDS" type="IDS"/>
             </xs:sequence>
           </xs:complexType>
         </xs:element>