opennebula-cli 6.0.0.2 → 6.1.80.pre

data/lib/one_helper/onezone_helper.rb

@@ -499,6 +499,13 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         "onezone.yaml"
     end
 
+    def self.state_to_str(id)
+        id        = id.to_i
+        state_str = Zone::ZONE_STATES[id]
+
+        Zone::SHORT_ZONE_STATES[state_str]
+    end
+
     def format_pool(options)
         config_file = self.class.table_conf
 
@@ -524,7 +531,11 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
                 helper.get_fed_index(d["TEMPLATE"]['ENDPOINT'])
             end
 
-            default :CURRENT, :ID, :NAME, :ENDPOINT, :FED_INDEX
+            column :STAT, 'Zone status', :left, :size => 6 do |d|
+                OneZoneHelper.state_to_str(d['STATE'])
+            end
+
+            default :CURRENT, :ID, :NAME, :ENDPOINT, :FED_INDEX, :STAT
         end
 
         table
@@ -591,6 +602,7 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         CLIHelper.print_header(str_h1 % "ZONE #{zone['ID']} INFORMATION")
         puts str % ["ID",   zone.id.to_s]
         puts str % ["NAME", zone.name]
+        puts str % ["STATE",zone.state_str]
         puts
 
         zone_hash=zone.to_hash

data/lib/one_helper.rb

@@ -576,6 +576,7 @@ EOT
             p_r, p_w = IO.pipe
 
             Signal.trap('PIPE', 'SIG_IGN')
+            Signal.trap('PIPE', 'EXIT')
 
             lpid = fork do
                 $stdin.reopen(p_r)
@@ -899,6 +900,9 @@ EOT
 
 
         def list_pool(options, top=false, filter_flag=nil)
+            # Capture Broken pipe
+            Signal.trap('PIPE', 'EXIT')
+
             table = format_pool(options)
 
             if options[:describe]
@@ -920,15 +924,11 @@ EOT
             elsif options[:json]
                 list_pool_format(pool, options, filter_flag) do |pool|
                     hash        = check_resource_xsd(pool, pname)
-                    hash[pname] = check_resource_xsd(hash[pname], ename)
-
                     puts ::JSON.pretty_generate(hash)
                 end
             elsif options[:yaml]
                 list_pool_format(pool, options, filter_flag) do |pool|
                     hash        = check_resource_xsd(pool, pname)
-                    hash[pname] = check_resource_xsd(hash[pname], ename)
-
                     puts hash.to_yaml(:indent => 4)
                 end
             else
@@ -936,6 +936,9 @@ EOT
             end
 
             return 0
+        rescue SystemExit, Interrupt
+            # Rescue ctrl + c when paginated
+            0
         end
 
         # Check if a resource defined by attributes is referenced in pool
@@ -1223,11 +1226,41 @@ EOT
 
             return hash unless xsd
 
-            hash[ename] = check_xsd(hash[ename], nil, ename, xsd)
+            if xsd.keys.include?('complexType')
+                xsd = xsd['complexType']['sequence']['element']
+            else
+                xsd = xsd['element']
+            end
+
+            xsd = [ xsd ] unless xsd.is_a? Array
+
+            check_xsd(hash[ename], xsd)
 
             hash
         end
 
+
+        # Replaces refs in xsd definition
+        # limited func: only traverse hashes (not arrays), but works well for pools
+        #
+        # @param h [Hash] XSD in hash format
+        #
+        # @return [Object] XSD but where ref were, there inner XSD is loaded
+        def replace_refs(h)
+            return h unless h.is_a? Hash
+
+            if h.keys.include? 'ref'
+                ref_xsd = read_xsd(h['ref'])
+                return ref_xsd unless ref_xsd.nil?
+                return h
+            else
+                h.each do |k,v|
+                    h[k] = replace_refs(v)
+                end
+            end
+        end
+
+
         # Read XSD file and parse to XML
         #
         # @param ename [String] Element name to read XSD
@@ -1250,141 +1283,95 @@ EOT
             end
 
             hash = Hash.from_xml(Nokogiri::XML(File.read(file)).to_s)
+
             hash = hash['schema']['element']
 
-            if hash.keys.include?('complexType')
-                hash['complexType']['sequence']['element']
-            else
-                hash['element']
-            end
+            hash = replace_refs(hash)
+
+            hash
         end
 
-        # Check values XSD
+        # Decides if given xsd definiton should be array in xml
+        # Must be hash and contain either 'maxOccurs' => unbounded'
+        #                              or 'maxOccurs' => >1
         #
-        # @param hash     [Object] Resource information in hash format
-        # @param elements [Array]  Keys to check
-        # @param ename    [String] Element name to take XSD
-        # @param xsd      [Hash]   XSD file content
-        # @param parents  [Array]  Parent keys of current hash
-        def check_xsd(hash, elements, ename, xsd, parents = [])
-            return unless hash
-
-            if (hash.is_a? Hash) && !hash.empty?
-                hash.map do |ki, vi|
-                    vi = [vi].flatten if is_array?(xsd, [ki])
-
-                    if (vi.is_a? Hash) && !vi.empty?
-                        parents << ki
-
-                        vi.map do |kj, vj|
-                            parents << kj
-
-                            path = (parents + [ki, kj]).uniq
-                            vj   = [vj].flatten if is_array?(xsd, path)
-
-                            hash[ki][kj] = check_xsd(vj,
-                                                     [ki, kj],
-                                                     ename,
-                                                     xsd,
-                                                     parents)
-                        end
-
-                        parents.clear
-                    elsif vi.is_a? Array
-                        hash[ki] = check_xsd(vi, [ki], ename, xsd, parents)
-                    else
-                        hash[ki] = check_xsd(vi, [ki], ename, xsd, parents)
-                    end
-                end
-
-                hash
-            elsif hash.is_a? Array
-                ret = []
-
-                hash.each do |v|
-                    ret << check_xsd(v, elements, ename, xsd, parents)
-                end
-
-                ret
-            else
-                check_type(hash) do
-                    type = get_xsd_path(xsd, elements)
-                    type['type'] unless type.nil?
-                end
-            end
+        # @param e [Hash] XSD definition transfomred in hash
+        #
+        # @return [Boolean]
+        #
+        def is_array?(e)
+            return false if e.nil?
+            return false unless e.is_a? Hash
+            e['maxOccurs'] == 'unbounded' || e['maxOccurs'].to_i > 1
         end
 
-        # Get xsd path value
+        # Decides if given xsd definiton is complex type sequence
+        # Must be hash and contain nested hash
+        #   ['complexType']['sequence']['element']
         #
-        # @param xsd      [Hash]  XSD information
-        # @param elements [Array] Path to get
+        # @param  [Hash] XSD definition transfomred in hash
         #
-        # @return [Hash] Path information
-        def get_xsd_path(xsd, elements)
-            return unless elements
-
-            element = elements.shift
-
-            # Return nil, because is an empty complexType
-            return unless element
-
-            element = [xsd].flatten.find do |v|
-                v['name'] == element || v['ref'] == element
-            end
-
-            # Return nil, because element was not find in XSD
-            return unless element
-
-            if element.keys.include?('complexType') && !elements.empty?
-                if element['complexType']['all']
-                    element = element['complexType']['all']['element']
-                else
-                    element = element['complexType']['sequence']['element']
-                end
-
-                get_xsd_path(element, elements)
-            else
-                element
-            end
+        # @return [Boolean]
+        #
+        def xsd_complex_sequence?(x)
+            x['complexType']['sequence']['element'] rescue return false
+            true
         end
 
-        # CHeck if current element is an array
+        # Decides if given xsd definiton is complex type all
+        # Must be hash and contain nested hash
+        #   ['complexType']['all']['element']
         #
-        # @param xsd      [Hash]  XSD information
-        # @param elements [Array] Path to check
+        # @param  [Hash] XSD definition transfomred in hash
         #
-        # @return [Boolean] True if it's an array, false otherwise
-        def is_array?(xsd, elements)
-            max = get_xsd_path(xsd, elements)
-            max = max['maxOccurs'] if max
-
-            max == 'unbounded' || max.to_i > 1
+        # @return [Boolean]
+        #
+        def xsd_complex_all?(x)
+            x['complexType']['all']['element'] rescue return false
+            true
         end
 
-        # Check XSD type for especific value
+        # Recursively traverse the OpenNebula resource (in Hash) and it's XSD
+        # Where array is required in XSD, there encapsulate the entry into [ ]
+        # Typically usefull for single disk, snapshots etc.
         #
-        # @param value [Object] Value to check
+        # @param hash     [Hash]   Resource information in hash format
+        # @param xsd      [Hash]   XSD of the resource, transformed into hash
         #
-        # @return [Object] nil if the type is not correct, value otherwise
-        def check_type(value)
-            type = yield if block_given?
+        def check_xsd(hash, xsd)
+            return unless hash or hash.empty?
 
-            # If there is no type, return current value
-            return value unless type
+            hash.each do |k, v|
 
-            types = %w[string decimal integer boolean date time]
-            type  = type.split(':')[1]
+                # find the elem definition in xsd array
+                xsd_elem = xsd.select { |e| e['name'] == k }.first unless xsd.nil?
 
-            if types.include?(type)
-                # If the current type is different, return string
-                # because this value doesn't respect the type
-                if (value.is_a? Hash) || (value.is_a? Array)
-                    ''
-                else
-                    value
+                if xsd_complex_sequence?(xsd_elem) || xsd_complex_all?(xsd_elem)
+
+                    # go deeper in xsd, xsd is ehter complex sequence or all
+                    begin
+                        inner_xsd = xsd_elem['complexType']['sequence']['element']
+                    rescue
+                        inner_xsd = xsd_elem['complexType']['all']['element']
+                    end
+
+                    # recursively traverse resource - hash
+                    if v.is_a? Hash
+                        hash[k] = check_xsd(v, inner_xsd)
+
+                    # recursively traverse resource - array
+                    elsif v.is_a? Array
+                        hash[k] = []
+                        v.each do |e|
+                            hash[k] << check_xsd(e, inner_xsd)
+                        end
+                    end
+                end
+
+                # if XSD requires array, do so in resource if missing
+                if is_array?(xsd_elem) && (! v.is_a? Array)
+                    hash[k] = [ v ]
                 end
-            else
-                value
             end
         end
     end
@@ -1893,8 +1880,10 @@ EOT
         if options[:size]
             ar << ', SIZE = ' << options[:size]
         else
-            STDERR.puts 'Address range needs to specify size (-s size)'
-            exit(-1)
+            unless options[:ip6]
+                STDERR.puts 'Address range needs to specify size (-s size)'
+                exit(-1)
+            end
         end
 
         if options[:ip6]
@@ -2164,10 +2153,10 @@ EOT
             when 'number', 'number-float'
                 if type == 'number'
                     header += 'Integer: '
-                    exp = INT_EXP
+                    exp = OneTemplateHelper::INT_EXP
                 else
                     header += 'Float: '
-                    exp = FLOAT_EXP
+                    exp = OneTemplateHelper::FLOAT_EXP
                 end
 
                 begin
@@ -2193,13 +2182,13 @@ EOT
                 end
 
                 if type == 'range'
-                    exp = INT_EXP
+                    exp = OneTemplateHelper::INT_EXP
                     min = min.to_i
                     max = max.to_i
 
                     header += "Integer in the range [#{min}..#{max}]: "
                 else
-                    exp = FLOAT_EXP
+                    exp = OneTemplateHelper::FLOAT_EXP
                     min = min.to_f
                     max = max.to_f
 

data/share/schemas/xsd/api_info.xsd

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- The information sent to the hook when $API is used in an API Hook follos the following schema   -->
+<!-- The information sent to the hook when $API is used in an API Hook follow the following schema   -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
   <xs:element name="CALL_INFO">
     <xs:complexType>
@@ -13,7 +13,7 @@
                 <xs:complexType>
                   <xs:sequence>
                     <xs:element name="POSITION" type="xs:integer"/>
-                    <xs:element name="TYPE" type="xs:integer">
+                    <xs:element name="TYPE" type="xs:string">
                       <xs:simpleType>
                         <xs:restriction base="xs:string">
                         <xs:enumeration value="IN"/>

data/share/schemas/xsd/hook_message_api.xsd

@@ -6,7 +6,7 @@
       <xs:sequence>
         <xs:element name="HOOK_TYPE" type="xs:string" fixed="API"/>
         <xs:element name="CALL" type="xs:string"/>
-         <!-- CALL_INFO type is defined in call_info.xsd   -->
+         <!-- CALL_INFO type is defined in api_info.xsd   -->
         <xs:element ref="CALL_INFO" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>

data/share/schemas/xsd/hook_message_state.xsd

@@ -16,7 +16,7 @@
         <xs:element name="STATE" type="xs:string"/>
         <xs:element name="LCM_STATE" type="xs:string" maxOccurs="1" minOccurs="0"/>
         <xs:element name="REMOTE_HOST" type="xs:string" maxOccurs="1" minOccurs="0"/>
-         <!-- The template of the resource (VM or Host) is inlcuded here -->
+         <!-- The template of the resource (VM or Host) is included here -->
          <xs:element ref="HOST" maxOccurs="1" minOccurs="0"/>
          <xs:element ref="VM" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>

data/share/schemas/xsd/host.xsd

@@ -53,7 +53,27 @@
               <xs:element name="PCI_DEVICES">
                 <xs:complexType>
                   <xs:sequence>
-                    <xs:element name="PCI" type="xs:anyType" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element name="PCI" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="ADDRESS" type="xs:string"/>
+                          <xs:element name="BUS" type="xs:string"/>
+                          <xs:element name="CLASS" type="xs:string"/>
+                          <xs:element name="CLASS_NAME" type="xs:string"/>
+                          <xs:element name="DEVICE" type="xs:string"/>
+                          <xs:element name="DEVICE_NAME" type="xs:string"/>
+                          <xs:element name="DOMAIN" type="xs:string"/>
+                          <xs:element name="FUNCTION" type="xs:string"/>
+                          <xs:element name="NUMA_NODE" type="xs:string"/>
+                          <xs:element name="SHORT_ADDRESS" type="xs:string"/>
+                          <xs:element name="SLOT" type="xs:string"/>
+                          <xs:element name="TYPE" type="xs:string"/>
+                          <xs:element name="VENDOR" type="xs:string"/>
+                          <xs:element name="VENDOR_NAME" type="xs:string"/>
+                          <xs:element name="VMID" type="xs:integer"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>

data/share/schemas/xsd/marketplace.xsd

@@ -10,6 +10,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="STATE" type="xs:integer"/>
         <xs:element name="MARKET_MAD" type="xs:string"/>
         <xs:element name="ZONE_ID" type="xs:string"/>
         <xs:element name="TOTAL_MB" type="xs:integer"/>

data/share/schemas/xsd/monitoring_data.xsd

@@ -6,17 +6,37 @@
       <xs:sequence>
         <xs:element name="MONITORING" minOccurs="0" maxOccurs="unbounded">
           <xs:complexType>
-            <xs:all>
+            <xs:sequence>
+              <!-- Percentage of 1 CPU consumed (two fully consumed cpu is 2.0) -->
               <xs:element name="CPU" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
+              <!-- Amount of bytes read from disk-->
               <xs:element name="DISKRDBYTES" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Number of IO read operations -->
               <xs:element name="DISKRDIOPS" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Amount of bytes written to disk -->
               <xs:element name="DISKWRBYTES" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Number of IO write operations -->
               <xs:element name="DISKWRIOPS" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Disk size details -->
+              <xs:element name="DISK_SIZE" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID" type="xs:integer"/>
+                    <xs:element name="SIZE" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <!-- ID of the VM -->
               <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Consumption in kilobytes -->
               <xs:element name="MEMORY" type="xs:integer" minOccurs="0" maxOccurs="1"/>
-              <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Received bytes from the network -->
               <xs:element name="NETRX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Sent bytes to the network -->
+              <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Exact time when monitoring info were retieved -->
               <xs:element name="TIMESTAMP" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- vCetner information -->
               <xs:element name="VCENTER_ESX_HOST" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="VCENTER_GUEST_STATE" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="VCENTER_RP_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -24,15 +44,7 @@
               <xs:element name="VCENTER_VMWARETOOLS_VERSION" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="VCENTER_VMWARETOOLS_VERSION_STATUS" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="VCENTER_VM_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
-              <xs:element name="DISK_SIZE" minOccurs="0" maxOccurs="unbounded">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element name="ID" type="xs:integer"/>
-                    <xs:element name="SIZE" type="xs:integer"/>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-            </xs:all>
+            </xs:sequence>
           </xs:complexType>
         </xs:element>
       </xs:sequence>

data/share/schemas/xsd/vm.xsd

@@ -50,7 +50,7 @@
         </xs:element>
         <xs:element name="MONITORING">
           <xs:complexType>
-            <xs:all>
+            <xs:sequence>
               <!-- Percentage of 1 CPU consumed (two fully consumed cpu is 2.0) -->
               <xs:element name="CPU" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
               <!-- Amount of bytes read from disk-->
@@ -61,14 +61,23 @@
               <xs:element name="DISKWRBYTES" type="xs:integer" minOccurs="0" maxOccurs="1"/>
               <!-- Number of IO write operations -->
               <xs:element name="DISKWRIOPS" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Disk size details -->
+              <xs:element name="DISK_SIZE" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID" type="xs:integer"/>
+                    <xs:element name="SIZE" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
               <!-- ID of the VM -->
               <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="1"/>
               <!-- Consumption in kilobytes -->
               <xs:element name="MEMORY" type="xs:integer" minOccurs="0" maxOccurs="1"/>
-              <!-- Sent bytes to the network -->
-              <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
               <!-- Received bytes from the network -->
               <xs:element name="NETRX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <!-- Sent bytes to the network -->
+              <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
               <!-- Exact time when monitoring info were retieved -->
               <xs:element name="TIMESTAMP" type="xs:integer" minOccurs="0" maxOccurs="1"/>
               <!-- vCetner information -->
@@ -79,13 +88,19 @@
               <xs:element name="VCENTER_VMWARETOOLS_VERSION" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="VCENTER_VMWARETOOLS_VERSION_STATUS" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="VCENTER_VM_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
-            </xs:all>
+            </xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name="TEMPLATE">
           <xs:complexType>
             <xs:sequence>
-              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="AUTOMATIC_DS_REQUIREMENTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="AUTOMATIC_NIC_REQUIREMENTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="AUTOMATIC_REQUIREMENTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="CLONING_TEMPLATE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="CONTEXT" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="CPU" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="CPU_COST" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="DISK" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                   <xs:sequence>
@@ -96,12 +111,20 @@
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
-              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="DISK_COST" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="EMULATOR" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <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="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"/>
+              <xs:element name="MEMORY_COST" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="MEMORY_MAX" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="MEMORY_SLOTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                   <xs:sequence>
-                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
-                    <xs:element name="BRIDGE_TYPE" type="xs:string"/>
                     <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
                     <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="VCENTER_NET_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -109,7 +132,6 @@
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
-              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
               <xs:element name="NIC_ALIAS" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                   <xs:sequence>
@@ -124,7 +146,39 @@
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
-              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="NIC_DEFAULT" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="NUMA_NODE" minOccurs="0" maxOccurs="1"/>
+              <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="SPICE_OPTIONS" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="SUBMIT_ON_HOLD" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="TEMPLATE_ID" type="xs:string"  minOccurs="0" maxOccurs="1"/>
+              <xs:element name="TM_MAD_SYSTEM" type="xs:string"/>
+              <xs:element name="TOPOLOGY" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCPU" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCPU_MAX" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VMGROUP" minOccurs="0" maxOccurs="unbounded"/>
+              <xs:element name="VMID" type="xs:string"/>
+              <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:sequence>
           </xs:complexType>
         </xs:element>