diff --git a/share/doc/xsd/datastore.xsd b/share/doc/xsd/datastore.xsd
index 64c5263b0b..5fd2ec29de 100644
--- a/share/doc/xsd/datastore.xsd
+++ b/share/doc/xsd/datastore.xsd
@@ -47,7 +47,21 @@
                 </xs:sequence>
               </xs:complexType>
         </xs:element>
-        <xs:element name="TEMPLATE" type="xs:anyType"/>
+        <xs:element name="TEMPLATE">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="VCENTER_DC_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_DC_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_DS_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_DS_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_HOST" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_PASSWORD" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_USER" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/share/doc/xsd/host.xsd b/share/doc/xsd/host.xsd
index 79ff68a584..a0e0381940 100644
--- a/share/doc/xsd/host.xsd
+++ b/share/doc/xsd/host.xsd
@@ -6,12 +6,11 @@
         <xs:element name="ID" type="xs:integer"/>
         <xs:element name="NAME" type="xs:string"/>
         <!-- STATE values
-        
           INIT                 = 0  Initial state for enabled hosts
           MONITORING_MONITORED = 1  Monitoring the host (from monitored)
           MONITORED            = 2  The host has been successfully monitored
           ERROR                = 3  An error ocurrer while monitoring the host
-          DISABLED             = 4  The host is disabled 
+          DISABLED             = 4  The host is disabled
           MONITORING_ERROR     = 5  Monitoring the host (from error)
           MONITORING_INIT      = 6  Monitoring the host (from init)
           MONITORING_DISABLED  = 7  Monitoring the host (from disabled)
@@ -84,7 +83,23 @@
                 </xs:sequence>
               </xs:complexType>
         </xs:element>
-        <xs:element name="TEMPLATE" type="xs:anyType"/>
+        <xs:element name="TEMPLATE">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="VCENTER_CCR_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_DS_REF" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+              <xs:element name="VCENTER_HOST" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_PASSWORD" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_RESOURCE_POOL_INFO" minOccurs="0" maxOccurs="unbounded"/>
+              <xs:element name="VCENTER_USER" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_VERSION" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/share/doc/xsd/image.xsd b/share/doc/xsd/image.xsd
index 121e8c540b..e74d48cdbc 100644
--- a/share/doc/xsd/image.xsd
+++ b/share/doc/xsd/image.xsd
@@ -84,7 +84,15 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TEMPLATE" type="xs:anyType"/>
+        <xs:element name="TEMPLATE">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="VCENTER_IMPORTED" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="SNAPSHOTS">
           <xs:complexType>
             <xs:sequence>
diff --git a/share/doc/xsd/oned.conf b/share/doc/xsd/oned.conf
deleted file mode 100644
index 2d9ae8959d..0000000000
--- a/share/doc/xsd/oned.conf
+++ /dev/null
@@ -1,1054 +0,0 @@
-#*******************************************************************************
-#                       OpenNebula Configuration file
-#*******************************************************************************
-
-#*******************************************************************************
-# Daemon configuration attributes
-#-------------------------------------------------------------------------------
-#  MANAGER_TIMER: Time in seconds the core uses to evaluate periodical functions.
-#  MONITORING_INTERVAL cannot have a smaller value than MANAGER_TIMER.
-#
-#  MONITORING_INTERVAL: Time in seconds between host and VM monitorization.
-#
-#  MONITORING_THREADS: Max. number of threads used to process monitor messages
-#
-#  HOST_PER_INTERVAL: Number of hosts monitored in each interval.
-#  HOST_MONITORING_EXPIRATION_TIME: Time, in seconds, to expire monitoring
-#  information. Use 0 to disable HOST monitoring recording.
-#
-#  VM_INDIVIDUAL_MONITORING: VM monitoring information is obtained along with the
-#  host information. For some custom monitor drivers you may need activate the
-#  individual VM monitoring process.
-#  VM_PER_INTERVAL: Number of VMs monitored in each interval, if the individual
-#  VM monitoring is set to yes.
-#  VM_MONITORING_EXPIRATION_TIME: Time, in seconds, to expire monitoring
-#  information. Use 0 to disable VM monitoring recording.
-#
-#  SCRIPTS_REMOTE_DIR: Remote path to store the monitoring and VM management
-#  scripts.
-#
-#  PORT: Port where oned will listen for xmlrpc calls.
-#  LISTEN_ADDRESS: Host IP to listen on for xmlrpc calls (default: all IPs).
-#
-#  DB: Configuration attributes for the database backend
-#   backend : can be sqlite or mysql (default is sqlite)
-#   server  : (mysql) host name or an IP address for the MySQL server
-#   port    : (mysql) port for the connection to the server.
-#                     If set to 0, the default port is used.
-#   user    : (mysql) user's MySQL login ID
-#   passwd  : (mysql) the password for user
-#   db_name : (mysql) the database name
-#
-#  VNC_PORTS: VNC port pool for automatic VNC port assignment, if possible the
-#  port will be set to ``START`` + ``VMID``
-#   start   : first port to assign
-#   reserved: comma separated list of ports
-#
-#  LOG: Configuration for the logging system
-#   system: defines the logging system:
-#      file      to log in the oned.log file
-#      syslog    to use the syslog facilities
-#      std       to use the default log stream (stderr) to use with systemd
-#   debug_level: 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG
-#
-#  VM_SUBMIT_ON_HOLD: Forces VMs to be created on hold state instead of pending.
-#  Values: YES or NO.
-#*******************************************************************************
-
-LOG = [
-  SYSTEM      = "file",
-  DEBUG_LEVEL = 3
-]
-
-MANAGER_TIMER = 2
-
-MONITORING_INTERVAL = 2
-MONITORING_THREADS  = 50
-
-#HOST_PER_INTERVAL               = 15
-#HOST_MONITORING_EXPIRATION_TIME = 43200
-
-#VM_INDIVIDUAL_MONITORING      = "no"
-#VM_PER_INTERVAL               = 5
-#VM_MONITORING_EXPIRATION_TIME = 14400
-
-SCRIPTS_REMOTE_DIR=/var/tmp/one
-
-PORT = 2633
-
-LISTEN_ADDRESS = "0.0.0.0"
-
-DB = [ BACKEND = "sqlite" ]
-
-# Sample configuration for MySQL
-# DB = [ BACKEND = "mysql",
-#        SERVER  = "localhost",
-#        PORT    = 0,
-#        USER    = "oneadmin",
-#        PASSWD  = "oneadmin",
-#        DB_NAME = "opennebula" ]
-
-VNC_PORTS = [
-    START    = 5900
-#    RESERVED = "6800, 6801, 9869"
-]
-
-#VM_SUBMIT_ON_HOLD = "NO"
-
-#*******************************************************************************
-# Federation configuration attributes
-#-------------------------------------------------------------------------------
-# Control the federation capabilities of oned. Operation in a federated setup
-# requires a special DB configuration.
-#
-#  FEDERATION: Federation attributes
-#   MODE: Operation mode of this oned.
-#       STANDALONE no federated.This is the default operational mode
-#       MASTER     this oned is the master zone of the federation
-#       SLAVE      this oned is a slave zone
-#   ZONE_ID: The zone ID as returned by onezone command
-#   MASTER_ONED: The xml-rpc endpoint of the master oned, e.g.
-#   http://master.one.org:2633/RPC2
-#*******************************************************************************
-
-FEDERATION = [
-    MODE        = "STANDALONE",
-    ZONE_ID     = 0,
-    MASTER_ONED = ""
-]
-
-#*******************************************************************************
-# Default showback cost
-#-------------------------------------------------------------------------------
-# The following attributes define the default cost for Virtual Machines that
-# don't have a CPU, MEMORY or DISK cost. This is used by the oneshowback
-# calculate method.
-#*******************************************************************************
-
-DEFAULT_COST = [
-    CPU_COST    = 0,
-    MEMORY_COST = 0,
-    DISK_COST   = 0
-]
-
-#*******************************************************************************
-# XML-RPC server configuration
-#-------------------------------------------------------------------------------
-#  These are configuration parameters for oned's xmlrpc-c server
-#
-#  MAX_CONN: Maximum number of simultaneous TCP connections the server
-#  will maintain
-#
-#  MAX_CONN_BACKLOG: Maximum number of TCP connections the operating system
-#  will accept on the server's behalf without the server accepting them from
-#  the operating system
-#
-#  KEEPALIVE_TIMEOUT: Maximum time in seconds that the server allows a
-#  connection to be open between RPCs
-#
-#  KEEPALIVE_MAX_CONN: Maximum number of RPCs that the server will execute on
-#  a single connection
-#
-#  TIMEOUT: Maximum time in seconds the server will wait for the client to
-#  do anything while processing an RPC. This timeout will be also used when
-#  proxy calls to the master in a federation.
-#
-#  RPC_LOG: Create a separated log file for xml-rpc requests, in
-#  "/var/log/one/one_xmlrpc.log".
-#
-#  MESSAGE_SIZE: Buffer size in bytes for XML-RPC responses.
-#
-#  LOG_CALL_FORMAT: Format string to log XML-RPC calls. Interpreted strings:
-#     %i -- request id
-#     %m -- method name
-#     %u -- user id
-#     %U -- user name
-#     %l -- param list
-#     %p -- user password
-#     %g -- group id
-#     %G -- group name
-#     %a -- auth token
-#     %% -- %
-#*******************************************************************************
-
-#MAX_CONN           = 15
-#MAX_CONN_BACKLOG   = 15
-#KEEPALIVE_TIMEOUT  = 15
-#KEEPALIVE_MAX_CONN = 30
-#TIMEOUT            = 15
-#RPC_LOG            = NO
-#MESSAGE_SIZE       = 1073741824
-#LOG_CALL_FORMAT    = "Req:%i UID:%u %m invoked %l"
-
-#*******************************************************************************
-# Physical Networks configuration
-#*******************************************************************************
-#  NETWORK_SIZE: Here you can define the default size for the virtual networks
-#
-#  MAC_PREFIX: Default MAC prefix to be used to create the auto-generated MAC
-#  addresses is defined here (this can be overwritten by the Virtual Network
-#  template)
-#
-#  VLAN_IDS: VLAN ID pool for the automatic VLAN_ID assignment. This pool
-#  is for 802.1Q networks (Open vSwitch and 802.1Q drivers). The driver
-#  will try first to allocate VLAN_IDS[START] + VNET_ID
-#     start: First VLAN_ID to use
-#     reserved: Comma separated list of VLAN_IDs
-#
-# VXLAN_IDS: Automatic VXLAN Network ID (VNI) assignment. This is used
-# for vxlan networks.
-#     start: First VNI to use
-#     NOTE: reserved is not supported by this pool
-#*******************************************************************************
-
-NETWORK_SIZE = 254
-
-MAC_PREFIX   = "02:00"
-
-VLAN_IDS = [
-    START    = "2",
-    RESERVED = "0, 1, 4095"
-]
-
-VXLAN_IDS = [
-    START = "2"
-]
-
-#*******************************************************************************
-# DataStore Configuration
-#*******************************************************************************
-#  DATASTORE_LOCATION: Path for Datastores. It IS the same for all the hosts
-#  and front-end. It defaults to /var/lib/one/datastores (in self-contained mode
-#  defaults to $ONE_LOCATION/var/datastores). Each datastore has its own
-#  directory (called BASE_PATH) in the form: $DATASTORE_LOCATION/<datastore_id>
-#  You can symlink this directory to any other path if needed. BASE_PATH is
-#  generated from this attribute each time oned is started.
-#
-#  DATASTORE_CAPACITY_CHECK: Checks that there is enough capacity before
-#  creating a new image. Defaults to Yes
-#
-#  DEFAULT_IMAGE_TYPE: This can take values
-#       OS        Image file holding an operating system
-#       CDROM     Image file holding a CDROM
-#       DATABLOCK Image file holding a datablock, created as an empty block
-#
-#  DEFAULT_DEVICE_PREFIX: This can be set to
-#       hd        IDE prefix
-#       sd        SCSI
-#       vd        KVM virtual disk
-#
-#  DEFAULT_CDROM_DEVICE_PREFIX: Same as above but for CDROM devices.
-#*******************************************************************************
-
-#DATASTORE_LOCATION  = /var/lib/one/datastores
-
-DATASTORE_CAPACITY_CHECK = "yes"
-
-DEFAULT_IMAGE_TYPE    = "OS"
-DEFAULT_DEVICE_PREFIX = "hd"
-
-DEFAULT_CDROM_DEVICE_PREFIX = "hd"
-
-#*******************************************************************************
-# Information Driver Configuration
-#*******************************************************************************
-# You can add more information managers with different configurations but make
-# sure it has different names.
-#
-#   name      : name for this information manager
-#
-#   executable: path of the information driver executable, can be an
-#               absolute path or relative to $ONE_LOCATION/lib/mads (or
-#               /usr/lib/one/mads/ if OpenNebula was installed in /)
-#
-#   arguments : for the driver executable, usually a probe configuration file,
-#               can be an absolute path or relative to $ONE_LOCATION/etc (or
-#               /etc/one/ if OpenNebula was installed in /)
-#*******************************************************************************
-
-#-------------------------------------------------------------------------------
-#  Information Collector for KVM IM's.
-#-------------------------------------------------------------------------------
-#  This driver CANNOT BE ASSIGNED TO A HOST, and needs to be used with KVM
-#    -h  prints this help.
-#    -a  Address to bind the collectd socket (default 0.0.0.0)
-#    -p  UDP port to listen for monitor information (default 4124)
-#    -f  Interval in seconds to flush collected information (default 5)
-#    -t  Number of threads for the server (default 50)
-#    -i  Time in seconds of the monitorization push cycle. This parameter must
-#        be smaller than MONITORING_INTERVAL, otherwise push monitorization will
-#        not be effective.
-#-------------------------------------------------------------------------------
-IM_MAD = [
-      NAME       = "collectd",
-      EXECUTABLE = "collectd",
-      ARGUMENTS  = "-p 4124 -f 5 -t 50 -i 20" ]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  KVM UDP-push Information Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of hosts monitored at the same time
-#-------------------------------------------------------------------------------
-IM_MAD = [
-      NAME          = "kvm",
-      SUNSTONE_NAME = "KVM",
-      EXECUTABLE    = "one_im_ssh",
-      ARGUMENTS     = "-r 3 -t 15 kvm" ]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  KVM SSH-pull Information Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of hosts monitored at the same time
-#-------------------------------------------------------------------------------
-# IM_MAD = [
-#       NAME          = "kvm",
-#       SUNSTONE_NAME = "kvm-ssh",
-#       EXECUTABLE    = "one_im_ssh",
-#       ARGUMENTS     = "-r 3 -t 15 kvm-probes" ]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  vCenter Information Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of hosts monitored at the same time
-#-------------------------------------------------------------------------------
-#IM_MAD = [
-#      NAME          = "vcenter",
-#      SUNSTONE_NAME = "VMWare vCenter",
-#      EXECUTABLE    = "one_im_sh",
-#      ARGUMENTS     = "-c -t 15 -r 0 vcenter" ]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  EC2 Information Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of hosts monitored at the same time
-#-------------------------------------------------------------------------------
-#IM_MAD = [
-#      NAME          = "ec2",
-#      SUNSTONE_NAME = "Amazon EC2",
-#      EXECUTABLE    = "one_im_sh",
-#      ARGUMENTS     = "-c -t 1 -r 0 ec2" ]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  Azure Information Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of hosts monitored at the same time
-#-------------------------------------------------------------------------------
-#IM_MAD = [
-#      NAME          = "az",
-#      SUNSTONE_NAME = "Microsoft Azure",
-#      EXECUTABLE    = "one_im_sh",
-#      ARGUMENTS     = "-c -t 1 -r 0 az" ]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  Dummy Information Driver Manager Configuration
-#-------------------------------------------------------------------------------
-IM_MAD = [ NAME="dummy", SUNSTONE_NAME="Testing", EXECUTABLE="one_im_dummy"]
-#-------------------------------------------------------------------------------
-
-#*******************************************************************************
-# Virtualization Driver Configuration
-#*******************************************************************************
-# You can add more virtualization managers with different configurations but
-# make sure it has different names.
-#
-#   name      : name of the virtual machine manager driver
-#
-#   executable: path of the virtualization driver executable, can be an
-#               absolute path or relative to $ONE_LOCATION/lib/mads (or
-#               /usr/lib/one/mads/ if OpenNebula was installed in /)
-#
-#   arguments : for the driver executable
-#
-#   default   : default values and configuration parameters for the driver, can
-#               be an absolute path or relative to $ONE_LOCATION/etc (or
-#               /etc/one/ if OpenNebula was installed in /)
-#
-#   type      : driver type, supported drivers: xen, kvm, xml
-#
-#   keep_snapshots: do not remove snapshots on power on/off cycles and live
-#   migrations if the hypervisor supports that.
-#
-#   imported_vms_actions : comma-separated list of actions supported
-#                          for imported vms. The available actions are:
-#                              migrate
-#                              live-migrate
-#                              terminate
-#                              terminate-hard
-#                              undeploy
-#                              undeploy-hard
-#                              hold
-#                              release
-#                              stop
-#                              suspend
-#                              resume
-#                              delete
-#                              delete-recreate
-#                              reboot
-#                              reboot-hard
-#                              resched
-#                              unresched
-#                              poweroff
-#                              poweroff-hard
-#                              disk-attach
-#                              disk-detach
-#                              nic-attach
-#                              nic-detach
-#                              snap-create
-#                              snap-delete
-#*******************************************************************************
-
-#-------------------------------------------------------------------------------
-#  KVM Virtualization Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of hosts monitored at the same time
-#    -l <actions[=command_name]> actions executed locally, command can be
-#        overridden for each action.
-#        Valid actions: deploy, shutdown, cancel, save, restore, migrate, poll
-#        An example: "-l migrate=migrate_local,save"
-#    -p more than one action per host in parallel, needs support from hypervisor
-#    -s <shell> to execute remote commands, bash by default
-#
-#  Note: You can use type = "qemu" to use qemu emulated guests, e.g. if your
-#  CPU does not have virtualization extensions or use nested Qemu-KVM hosts
-#-------------------------------------------------------------------------------
-VM_MAD = [
-    NAME           = "kvm",
-    SUNSTONE_NAME  = "KVM",
-    EXECUTABLE     = "one_vmm_exec",
-    ARGUMENTS      = "-t 15 -r 0 kvm",
-    DEFAULT        = "vmm_exec/vmm_exec_kvm.conf",
-    TYPE           = "kvm",
-    KEEP_SNAPSHOTS = "no",
-    IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, suspend,
-        resume, delete, reboot, reboot-hard, resched, unresched, disk-attach,
-        disk-detach, nic-attach, nic-detach, snap-create, snap-delete"
-]
-
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  vCenter Virtualization Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of hosts monitored at the same time
-#    -p more than one action per host in parallel, needs support from hypervisor
-#    -s <shell> to execute commands, bash by default
-#    -d default snapshot strategy. It can be either 'detach' or 'suspend'. It
-#       defaults to 'suspend'.
-#-------------------------------------------------------------------------------
-#VM_MAD = [
-#    NAME           = "vcenter",
-#    SUNSTONE_NAME  = "VMWare vCenter",
-#    EXECUTABLE     = "one_vmm_sh",
-#    ARGUMENTS      = "-p -t 15 -r 0 vcenter -s sh",
-#    DEFAULT        = "vmm_exec/vmm_exec_vcenter.conf",
-#    TYPE           = "xml",
-#    KEEP_SNAPSHOTS = "yes",
-#    IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, suspend,
-#        resume, delete, reboot, reboot-hard, resched, unresched, poweroff,
-#        poweroff-hard, disk-attach, disk-detach, nic-attach, nic-detach,
-#        snap-create, snap-delete"
-#]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  EC2 Virtualization Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of actions performed at the same time
-#-------------------------------------------------------------------------------
-#VM_MAD = [
-#    NAME           = "ec2",
-#    SUNSTONE_NAME  = "Amazon EC2",
-#    EXECUTABLE     = "one_vmm_sh",
-#    ARGUMENTS      = "-t 15 -r 0 ec2",
-#    TYPE           = "xml",
-#    KEEP_SNAPSHOTS = "no",
-#    IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, suspend,
-#        resume, delete, reboot, reboot-hard, resched, unresched, poweroff,
-#        poweroff-hard, disk-attach, disk-detach, nic-attach, nic-detach,
-#        snap-create, snap-delete"
-#]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  Azure Virtualization Driver Manager Configuration
-#    -r number of retries when monitoring a host
-#    -t number of threads, i.e. number of actions performed at the same time
-#-------------------------------------------------------------------------------
-#VM_MAD = [
-#    NAME           = "az",
-#    SUNSTONE_NAME  = "Microsoft Azure",
-#    EXECUTABLE     = "one_vmm_sh",
-#    ARGUMENTS      = "-t 15 -r 0 az",
-#    TYPE           = "xml",
-#    KEEP_SNAPSHOTS = "no",
-#    IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, suspend,
-#        resume, delete, reboot, reboot-hard, resched, unresched, poweroff,
-#        poweroff-hard, disk-attach, disk-detach, nic-attach, nic-detach,
-#        snap-create, snap-delete"
-#]
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#  Dummy Virtualization Driver Configuration
-#-------------------------------------------------------------------------------
-VM_MAD = [ NAME="dummy", SUNSTONE_NAME="Testing", EXECUTABLE="one_vmm_dummy",
-  TYPE="xml" ]
-#-------------------------------------------------------------------------------
-
-#*******************************************************************************
-# Transfer Manager Driver Configuration
-#*******************************************************************************
-# You can add more transfer managers with different configurations but make
-# sure it has different names.
-#   name      : name for this transfer driver
-#
-#   executable: path of the transfer driver executable, can be an
-#               absolute path or relative to $ONE_LOCATION/lib/mads (or
-#               /usr/lib/one/mads/ if OpenNebula was installed in /)
-#   arguments :
-#       -t: number of threads, i.e. number of transfers made at the same time
-#       -d: list of transfer drivers separated by commas, if not defined all the
-#           drivers available will be enabled
-#*******************************************************************************
-
-TM_MAD = [
-    EXECUTABLE = "one_tm",
-    ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,qcow2,ssh,ceph,dev,vcenter,iscsi_libvirt"
-]
-
-#*******************************************************************************
-# Datastore Driver Configuration
-#*******************************************************************************
-# Drivers to manage the datastores, specialized for the storage backend
-#   executable: path of the transfer driver executable, can be an
-#               absolute path or relative to $ONE_LOCATION/lib/mads (or
-#               /usr/lib/one/mads/ if OpenNebula was installed in /)
-#
-#   arguments : for the driver executable
-#       -t number of threads, i.e. number of repo operations at the same time
-#       -d datastore mads separated by commas
-#       -s system datastore tm drivers, used to monitor shared system ds.
-#*******************************************************************************
-
-DATASTORE_MAD = [
-    EXECUTABLE = "one_datastore",
-    ARGUMENTS  = "-t 15 -d dummy,fs,lvm,ceph,dev,iscsi_libvirt,vcenter -s shared,ssh,ceph,fs_lvm,vcenter"
-]
-
-#*******************************************************************************
-# Marketplace Driver Configuration
-#*******************************************************************************
-# Drivers to manage different marketplaces, specialized for the storage backend
-#   executable: path of the transfer driver executable, can be an
-#               absolute path or relative to $ONE_LOCATION/lib/mads (or
-#               /usr/lib/one/mads/ if OpenNebula was installed in /)
-#
-#   arguments : for the driver executable
-#       -t number of threads, i.e. number of repo operations at the same time
-#       -m marketplace mads separated by commas
-#*******************************************************************************
-
-MARKET_MAD = [
-    EXECUTABLE = "one_market",
-    ARGUMENTS  = "-t 15 -m http,s3,one"
-]
-
-#*******************************************************************************
-# Hook Manager Configuration
-#*******************************************************************************
-# The Driver (HM_MAD)
-# -----------------------------------------------
-#
-# Used to execute the Hooks:
-#   executable: path of the hook driver executable, can be an
-#               absolute path or relative to $ONE_LOCATION/lib/mads (or
-#               /usr/lib/one/mads/ if OpenNebula was installed in /)
-#
-#   arguments : for the driver executable, can be an absolute path or relative
-#               to $ONE_LOCATION/etc (or /etc/one/ if OpenNebula was installed
-#               in /)
-#
-# Virtual Machine Hooks (VM_HOOK)
-# -------------------------------
-#
-# Defined by:
-#   name      : for the hook, useful to track the hook (OPTIONAL)
-#   on        : when the hook should be executed,
-#               - CREATE, when the VM is created (onevm create)
-#               - PROLOG, when the VM is in the prolog state
-#               - RUNNING, after the VM is successfully booted
-#               - UNKNOWN, when the VM is in the unknown state
-#               - SHUTDOWN, after the VM is shutdown
-#               - STOP, after the VM is stopped (including VM image transfers)
-#               - DONE, after the VM is deleted or shutdown
-#               - CUSTOM, user defined specific STATE and LCM_STATE combination
-#                 of states to trigger the hook.
-#   command   : path is relative to $ONE_LOCATION/var/remotes/hook
-#               (self-contained) or to /var/lib/one/remotes/hook (system-wide).
-#               That directory will be copied on the hosts under
-#               SCRIPTS_REMOTE_DIR. It can be an absolute path that must exist
-#               on the target host
-#   arguments : for the hook. You can access to VM information with $
-#               - $ID, the ID of the virtual machine
-#               - $TEMPLATE, the VM template in xml and base64 encoded
-#               - $PREV_STATE, the previous STATE of the Virtual Machine
-#               - $PREV_LCM_STATE, the previous LCM STATE of the Virtual Machine
-#   remote    : values,
-#               - YES, The hook is executed in the host where the VM was
-#                 allocated
-#               - NO, The hook is executed in the OpenNebula server (default)
-#
-# Example Virtual Machine Hook
-# ----------------------------
-#
-# VM_HOOK = [
-#   name      = "advanced_hook",
-#   on        = "CUSTOM",
-#   state     = "ACTIVE",
-#   lcm_state = "BOOT_UNKNOWN",
-#   command   = "log.rb",
-#   arguments = "$ID $PREV_STATE $PREV_LCM_STATE" ]
-#
-# Host Hooks (HOST_HOOK)
-# -------------------------------
-#
-# Defined by:
-#   name      : for the hook, useful to track the hook (OPTIONAL)
-#   on        : when the hook should be executed,
-#               - CREATE, when the Host is created (onehost create)
-#               - ERROR, when the Host enters the error state
-#               - DISABLE, when the Host is disabled
-#   command   : path is relative to $ONE_LOCATION/var/remotes/hook
-#               (self-contained) or to /var/lib/one/remotes/hook (system-wide).
-#               That directory will be copied on the hosts under
-#               SCRIPTS_REMOTE_DIR. It can be an absolute path that must exist
-#               on the target host.
-#   arguments : for the hook. You can use the following Host information:
-#               - $ID, the ID of the host
-#               - $TEMPLATE, the Host template in xml and base64 encoded
-#   remote    : values,
-#               - YES, The hook is executed in the host
-#               - NO, The hook is executed in the OpenNebula server (default)
-#
-# Virtual Network (VNET_HOOK)
-# Virtual Router (VROUTER_HOOK)
-# User (USER_HOOK)
-# Group (GROUP_HOOK)
-# Image (IMAGE_HOOK)
-# -------------------------------
-#
-# These hooks are executed when one of the referring entities are created or
-# removed. Each hook is defined by:
-#   name      : for the hook, useful to track the hook (OPTIONAL)
-#   on        : when the hook should be executed,
-#               - CREATE, when the vnet is created
-#               - REMOVE, when the vnet is removed
-#   command   : path is relative to $ONE_LOCATION/var/remotes/hook
-#               (self-contained) or to /var/lib/one/remotes/hook (system-wide).
-#               That directory will be copied on the hosts under
-#               SCRIPTS_REMOTE_DIR. It can be an absolute path that must exist
-#               on the target host.
-#   arguments : for the hook. You can use the following Host information:
-#               - $ID, the ID of the host
-#               - $TEMPLATE, the vnet template in xml and base64 encoded
-#
-# Please note: In a Federation, User and Group hooks can only be defined in
-# the master OpenNebula.
-#-------------------------------------------------------------------------------
-HM_MAD = [
-    EXECUTABLE = "one_hm" ]
-
-#VNET_HOOK = [
-#    name      = "vcenter_net_create",
-#    on        = "CREATE",
-#    command   = "ft/create_vcenter_net.rb",
-#    arguments = "$ID $TEMPLATE"]
-
-#VNET_HOOK = [
-#    name      = "vcenter_net_delete",
-#    on        = "REMOVE",
-#    command   = "ft/delete_vcenter_net.rb",
-#    arguments = "$ID $TEMPLATE"]
-
-
-#*******************************************************************************
-# Fault Tolerance Hooks
-#*******************************************************************************
-# This hook is used to perform recovery actions when a host fails.
-# Script to implement host failure tolerance
-#   It can be set to
-#           -m migrate VMs to another host. Only for images in shared storage
-#           -r recreate VMs running in the host. State will be lost.
-#           -d delete VMs running in the host
-#   Additional flags
-#           -f force resubmission of suspended VMs
-#           -p <n> avoid resubmission if host comes
-#                  back after n monitoring cycles
-#*******************************************************************************
-#
-#HOST_HOOK = [
-#    NAME      = "error",
-#    ON        = "ERROR",
-#    COMMAND   = "ft/host_error.rb",
-#    ARGUMENTS = "$ID -m -p 5",
-#    REMOTE    = "no" ]
-#-------------------------------------------------------------------------------
-
-#*******************************************************************************
-# Auth Manager Configuration
-#*******************************************************************************
-# AUTH_MAD: The Driver that will be used to authenticate (authn) and
-# authorize (authz) OpenNebula requests. If defined OpenNebula will use the
-# built-in auth policies.
-#
-#   executable: path of the auth driver executable, can be an
-#               absolute path or relative to $ONE_LOCATION/lib/mads (or
-#               /usr/lib/one/mads/ if OpenNebula was installed in /)
-#
-#   authn     : list of authentication modules separated by commas, if not
-#               defined all the modules available will be enabled
-#   authz     : list of authentication modules separated by commas
-#
-# DEFAULT_AUTH: The default authentication driver to use when OpenNebula does
-# not know the user and needs to authenticate it externally.  If you want to
-# use "default" (not recommended, but supported for backwards compatibility
-# reasons) make sure you create a symlink pointing to the actual authentication
-# driver in /var/lib/one/remotes/auth, and add "default" to the 'auth'
-# parameter in the 'AUTH_MAD' section.
-#
-# SESSION_EXPIRATION_TIME: Time in seconds to keep an authenticated token as
-# valid. During this time, the driver is not used. Use 0 to disable session
-# caching
-#
-# ENABLE_OTHER_PERMISSIONS: Whether or not users can set the permissions for
-# 'other', so publishing or sharing resources with others. Users in the oneadmin
-# group will still be able to change these permissions. Values: YES or NO.
-#
-# DEFAULT_UMASK: Similar to Unix umask, sets the default resources permissions.
-# Its format must be 3 octal digits. For example a umask of 137 will set
-# the new object's permissions to 640 "um- u-- ---"
-#*******************************************************************************
-
-AUTH_MAD = [
-    EXECUTABLE = "one_auth_mad",
-    AUTHN = "ssh,x509,ldap,server_cipher,server_x509"
-]
-
-#DEFAULT_AUTH = "default"
-
-SESSION_EXPIRATION_TIME = 900
-
-#ENABLE_OTHER_PERMISSIONS = "YES"
-
-DEFAULT_UMASK = 177
-
-#*******************************************************************************
-# OneGate
-#   ONEGATE_ENDPOINT: The URL for the onegate server (the Gate to OpenNebula for
-#   VMs). The onegate server is started using a separate command. The endpoint
-#   MUST be consistent with the values in onegate-server.conf
-#*******************************************************************************
-
-#ONEGATE_ENDPOINT = "http://frontend:5030"
-
-#*******************************************************************************
-# Restricted Attributes Configuration
-#*******************************************************************************
-# The following attributes are restricted to users outside the oneadmin group
-#*******************************************************************************
-
-VM_RESTRICTED_ATTR = "CONTEXT/FILES"
-VM_RESTRICTED_ATTR = "NIC/MAC"
-VM_RESTRICTED_ATTR = "NIC/VLAN_ID"
-VM_RESTRICTED_ATTR = "NIC/BRIDGE"
-VM_RESTRICTED_ATTR = "NIC_DEFAULT/MAC"
-VM_RESTRICTED_ATTR = "NIC_DEFAULT/VLAN_ID"
-VM_RESTRICTED_ATTR = "NIC_DEFAULT/BRIDGE"
-#VM_RESTRICTED_ATTR = "NIC/OPENNEBULA_MANAGED"
-#VM_RESTRICTED_ATTR = "NIC/VCENTER_INSTANCE_ID"
-#VM_RESTRICTED_ATTR = "NIC/VCENTER_NET_REF"
-#VM_RESTRICTED_ATTR = "NIC/VCENTER_PORTGROUP_TYPE"
-VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC"
-VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC_MAX_LENGTH"
-VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC_MAX"
-VM_RESTRICTED_ATTR = "DISK/READ_BYTES_SEC"
-VM_RESTRICTED_ATTR = "DISK/READ_BYTES_SEC_MAX_LENGTH"
-VM_RESTRICTED_ATTR = "DISK/READ_BYTES_SEC_MAX"
-VM_RESTRICTED_ATTR = "DISK/WRITE_BYTES_SEC"
-VM_RESTRICTED_ATTR = "DISK/WRITE_BYTES_SEC_MAX_LENGTH"
-VM_RESTRICTED_ATTR = "DISK/WRITE_BYTES_SEC_MAX"
-VM_RESTRICTED_ATTR = "DISK/TOTAL_IOPS_SEC"
-VM_RESTRICTED_ATTR = "DISK/TOTAL_IOPS_SEC_MAX_LENGTH"
-VM_RESTRICTED_ATTR = "DISK/TOTAL_IOPS_SEC_MAX"
-VM_RESTRICTED_ATTR = "DISK/READ_IOPS_SEC"
-VM_RESTRICTED_ATTR = "DISK/READ_IOPS_SEC_MAX_LENGTH"
-VM_RESTRICTED_ATTR = "DISK/READ_IOPS_SEC_MAX"
-VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC"
-VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC_MAX_LENGTH"
-VM_RESTRICTED_ATTR = "DISK/WRITE_IOPS_SEC_MAX"
-#VM_RESTRICTED_ATTR = "DISK/OPENNEBULA_MANAGED"
-#VM_RESTRICTED_ATTR = "DISK/VCENTER_DS_REF"
-#VM_RESTRICTED_ATTR = "DISK/VCENTER_INSTANCE_ID"
-#VM_RESTRICTED_ATTR = "DISK/SIZE"
-VM_RESTRICTED_ATTR = "DISK/ORIGINAL_SIZE"
-VM_RESTRICTED_ATTR = "CPU_COST"
-VM_RESTRICTED_ATTR = "MEMORY_COST"
-VM_RESTRICTED_ATTR = "DISK_COST"
-VM_RESTRICTED_ATTR = "PCI"
-VM_RESTRICTED_ATTR = "USER_INPUTS"
-#VM_RESTRICTED_ATTR = "TEMPLATE/VCENTER_VM_FOLDER"
-
-#VM_RESTRICTED_ATTR = "RANK"
-#VM_RESTRICTED_ATTR = "SCHED_RANK"
-#VM_RESTRICTED_ATTR = "REQUIREMENTS"
-#VM_RESTRICTED_ATTR = "SCHED_REQUIREMENTS"
-
-IMAGE_RESTRICTED_ATTR = "SOURCE"
-#IMAGE_RESTRICTED_ATTR = "TEMPLATE/VCENTER_IMPORTED"
-
-#*******************************************************************************
-# The following restricted attributes only apply to VNets that are a reservation.
-# Normal VNets do not have restricted attributes.
-#*******************************************************************************
-
-VNET_RESTRICTED_ATTR = "VN_MAD"
-VNET_RESTRICTED_ATTR = "PHYDEV"
-VNET_RESTRICTED_ATTR = "VLAN_ID"
-VNET_RESTRICTED_ATTR = "BRIDGE"
-
-VNET_RESTRICTED_ATTR = "AR/VN_MAD"
-VNET_RESTRICTED_ATTR = "AR/PHYDEV"
-VNET_RESTRICTED_ATTR = "AR/VLAN_ID"
-VNET_RESTRICTED_ATTR = "AR/BRIDGE"
-
-#*******************************************************************************
-# Inherited Attributes Configuration
-#*******************************************************************************
-# The following attributes will be copied from the resource template to the
-# instantiated VMs. More than one attribute can be defined.
-#
-# INHERIT_IMAGE_ATTR: Attribute to be copied from the Image template
-# to each VM/DISK.
-#
-# INHERIT_DATASTORE_ATTR: Attribute to be copied from the Datastore template
-# to each VM/DISK.
-#
-# INHERIT_VNET_ATTR: Attribute to be copied from the Network template
-# to each VM/NIC.
-#*******************************************************************************
-
-#INHERIT_IMAGE_ATTR     = "EXAMPLE"
-#INHERIT_IMAGE_ATTR     = "SECOND_EXAMPLE"
-#INHERIT_DATASTORE_ATTR = "COLOR"
-#INHERIT_VNET_ATTR      = "BANDWIDTH_THROTTLING"
-
-INHERIT_DATASTORE_ATTR  = "CEPH_HOST"
-INHERIT_DATASTORE_ATTR  = "CEPH_SECRET"
-INHERIT_DATASTORE_ATTR  = "CEPH_USER"
-INHERIT_DATASTORE_ATTR  = "CEPH_CONF"
-INHERIT_DATASTORE_ATTR  = "POOL_NAME"
-
-INHERIT_DATASTORE_ATTR  = "ISCSI_USER"
-INHERIT_DATASTORE_ATTR  = "ISCSI_USAGE"
-INHERIT_DATASTORE_ATTR  = "ISCSI_HOST"
-INHERIT_DATASTORE_ATTR  = "ALLOW_ORPHANS"
-
-INHERIT_IMAGE_ATTR      = "ISCSI_USER"
-INHERIT_IMAGE_ATTR      = "ISCSI_USAGE"
-INHERIT_IMAGE_ATTR      = "ISCSI_HOST"
-INHERIT_IMAGE_ATTR      = "ISCSI_IQN"
-
-INHERIT_DATASTORE_ATTR  = "GLUSTER_HOST"
-INHERIT_DATASTORE_ATTR  = "GLUSTER_VOLUME"
-
-INHERIT_DATASTORE_ATTR  = "DISK_TYPE"
-INHERIT_DATASTORE_ATTR  = "VCENTER_ADAPTER_TYPE"
-INHERIT_DATASTORE_ATTR  = "VCENTER_DISK_TYPE"
-INHERIT_DATASTORE_ATTR  = "VCENTER_DS_REF"
-INHERIT_DATASTORE_ATTR  = "VCENTER_DS_IMAGE_DIR"
-INHERIT_DATASTORE_ATTR  = "VCENTER_DS_VOLATILE_DIR"
-INHERIT_DATASTORE_ATTR  = "VCENTER_INSTANCE_ID"
-
-INHERIT_IMAGE_ATTR      = "DISK_TYPE"
-INHERIT_IMAGE_ATTR      = "VCENTER_ADAPTER_TYPE"
-INHERIT_IMAGE_ATTR      = "VCENTER_DISK_TYPE"
-
-INHERIT_VNET_ATTR       = "VLAN_TAGGED_ID"
-INHERIT_VNET_ATTR       = "FILTER_IP_SPOOFING"
-INHERIT_VNET_ATTR       = "FILTER_MAC_SPOOFING"
-INHERIT_VNET_ATTR       = "MTU"
-INHERIT_VNET_ATTR       = "INBOUND_AVG_BW"
-INHERIT_VNET_ATTR       = "INBOUND_PEAK_BW"
-INHERIT_VNET_ATTR       = "INBOUND_PEAK_KB"
-INHERIT_VNET_ATTR       = "OUTBOUND_AVG_BW"
-INHERIT_VNET_ATTR       = "OUTBOUND_PEAK_BW"
-INHERIT_VNET_ATTR       = "OUTBOUND_PEAK_KB"
-
-INHERIT_VNET_ATTR       = "VCENTER_NET_REF"
-INHERIT_VNET_ATTR       = "VCENTER_SWITCH_NAME"
-INHERIT_VNET_ATTR       = "VCENTER_SWITCH_NPORTS"
-INHERIT_VNET_ATTR       = "VCENTER_PORTGROUP_TYPE"
-INHERIT_VNET_ATTR       = "VCENTER_CCR_REF"
-INHERIT_VNET_ATTR       = "VCENTER_INSTANCE_ID"
-
-#*******************************************************************************
-# Transfer Manager Driver Behavior Configuration
-#*******************************************************************************
-# The  configuration for each driver is defined in TM_MAD_CONF. These
-# values are used when creating a new datastore and should not be modified
-# since they define the datastore behavior.
-#   name      : name of the transfer driver, listed in the -d option of the
-#               TM_MAD section
-#   ln_target : determines how the persistent images will be cloned when
-#               a new VM is instantiated.
-#       NONE: The image will be linked and no more storage capacity will be used
-#       SELF: The image will be cloned in the Images datastore
-#       SYSTEM: The image will be cloned in the System datastore
-#   clone_target : determines how the non persistent images will be
-#                  cloned when a new VM is instantiated.
-#       NONE: The image will be linked and no more storage capacity will be used
-#       SELF: The image will be cloned in the Images datastore
-#       SYSTEM: The image will be cloned in the System datastore
-#   shared : determines if the storage holding the system datastore is shared
-#            among the different hosts or not. Valid values: "yes" or "no"
-#   ds_migrate : The driver allows migrations across datastores. Valid values:
-#               "yes" or "no". Note: THIS ONLY APPLIES TO SYSTEM DS.
-#*******************************************************************************
-
-TM_MAD_CONF = [
-    NAME = "dummy", LN_TARGET = "NONE", CLONE_TARGET = "SYSTEM", SHARED = "YES",
-    DS_MIGRATE = "YES", ALLOW_ORPHANS = "no"
-]
-
-TM_MAD_CONF = [
-    NAME = "lvm", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES"
-]
-
-TM_MAD_CONF = [
-    NAME = "shared", LN_TARGET = "NONE", CLONE_TARGET = "SYSTEM", SHARED = "YES",
-    DS_MIGRATE = "YES"
-]
-
-TM_MAD_CONF = [
-    NAME = "fs_lvm", LN_TARGET = "SYSTEM", CLONE_TARGET = "SYSTEM", SHARED="YES"
-]
-
-TM_MAD_CONF = [
-    NAME = "qcow2", LN_TARGET = "NONE", CLONE_TARGET = "SYSTEM", SHARED = "YES"
-]
-
-TM_MAD_CONF = [
-    NAME = "ssh", LN_TARGET = "SYSTEM", CLONE_TARGET = "SYSTEM", SHARED = "NO",
-    DS_MIGRATE = "YES"
-]
-
-TM_MAD_CONF = [
-    NAME = "ceph", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
-    DS_MIGRATE = "NO"
-]
-
-TM_MAD_CONF = [
-    NAME = "iscsi_libvirt", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
-    DS_MIGRATE = "NO"
-]
-
-TM_MAD_CONF = [
-    NAME = "dev", LN_TARGET = "NONE", CLONE_TARGET = "NONE", SHARED = "YES"
-]
-
-TM_MAD_CONF = [
-    NAME = "vcenter", LN_TARGET = "NONE", CLONE_TARGET = "NONE", SHARED = "YES"
-]
-
-#*******************************************************************************
-# Datastore Manager Driver Behavior Configuration
-#*******************************************************************************
-# The  configuration for each driver is defined in DS_MAD_CONF. These
-# values are used when creating a new datastore and should not be modified
-# since they define the datastore behavior.
-#   name      : name of the transfer driver, listed in the -d option of the
-#               DS_MAD section
-#   required_attrs : comma separated list of required attributes in the DS
-#                    template
-#   persistent_only: specifies whether the datastore can only manage persistent
-#                    images
-#*******************************************************************************
-
-DS_MAD_CONF = [
-    NAME = "ceph",
-    REQUIRED_ATTRS = "DISK_TYPE,BRIDGE_LIST,CEPH_HOST,CEPH_USER,CEPH_SECRET",
-    PERSISTENT_ONLY = "NO",
-    MARKETPLACE_ACTIONS = "export"
-]
-
-DS_MAD_CONF = [
-    NAME = "dev", REQUIRED_ATTRS = "DISK_TYPE", PERSISTENT_ONLY = "YES"
-]
-
-DS_MAD_CONF = [
-    NAME = "iscsi_libvirt", REQUIRED_ATTRS = "DISK_TYPE,ISCSI_HOST",
-    PERSISTENT_ONLY = "YES"
-]
-
-DS_MAD_CONF = [
-    NAME = "dummy", REQUIRED_ATTRS = "", PERSISTENT_ONLY = "NO"
-]
-
-DS_MAD_CONF = [
-    NAME = "fs", REQUIRED_ATTRS = "", PERSISTENT_ONLY = "NO",
-    MARKETPLACE_ACTIONS = "export"
-]
-
-DS_MAD_CONF = [
-    NAME = "lvm", REQUIRED_ATTRS = "DISK_TYPE,BRIDGE_LIST",
-    PERSISTENT_ONLY = "NO"
-]
-
-DS_MAD_CONF = [
-    NAME = "vcenter",
-    REQUIRED_ATTRS = "VCENTER_INSTANCE_ID, VCENTER_DS_REF, VCENTER_DC_REF",
-    PERSISTENT_ONLY = "YES",
-    MARKETPLACE_ACTIONS = "export"
-]
-
-#*******************************************************************************
-# MarketPlace Driver Behavior Configuration
-#*******************************************************************************
-# The  configuration for each driver is defined in MARKET_MAD_CONF. These
-# values are used when creating a new marketplaces and should not be modified
-# since they define the marketplace behavior.
-#   name      : name of the market driver
-#   required_attrs : comma separated list of required attributes in the Market
-#                    template
-#   app_actions: List of actions allowed for a MarketPlaceApp
-#     - monitor The apps of the marketplace will be monitored
-#     - create, the app in the marketplace
-#     - delete, the app from the marketplace
-#   public: set to yes for external marketplaces. A public marketplace can be
-#   removed even if it has registered apps.
-#*******************************************************************************
-
-MARKET_MAD_CONF = [
-    NAME = "one",
-    REQUIRED_ATTRS = "",
-    APP_ACTIONS = "monitor",
-    PUBLIC = "yes"
-]
-
-MARKET_MAD_CONF = [
-    NAME = "http",
-    REQUIRED_ATTRS = "BASE_URL,PUBLIC_DIR",
-    APP_ACTIONS = "create, delete, monitor"
-]
-
-MARKET_MAD_CONF = [
-    NAME = "s3",
-    REQUIRED_ATTRS = "ACCESS_KEY_ID,SECRET_ACCESS_KEY,REGION,BUCKET",
-    APP_ACTIONS = "create, delete, monitor"
-]
diff --git a/share/doc/xsd/test.sh b/share/doc/xsd/test.sh
index dc6617c1c9..68e864f135 100755
--- a/share/doc/xsd/test.sh
+++ b/share/doc/xsd/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -26,20 +26,26 @@ mkdir -p samples/vmtemplate samples/vmtemplate_pool
 mkdir -p samples/user       samples/user_pool
 mkdir -p samples/vm         samples/vm_pool
 mkdir -p samples/vnet       samples/vnet_pool
-mkdir -p samples/vm_group    samples/vm_group_pool
+mkdir -p samples/vm_group   samples/vm_group_pool
 mkdir -p samples/acct
 mkdir -p samples/vrouter            samples/vrouter_pool
 mkdir -p samples/marketplace        samples/marketplace_pool
 mkdir -p samples/marketplaceapp     samples/marketplaceapp_pool
+mkdir -p samples/zone       samples/zone_pool
 touch output.log
 cp oned.conf /etc/one/oned.conf
 
+## VCENTER CONFIGURATION
+vcenter="vcenter.vcenter65-1"
+vuser="administrator@vsphere.local"
+vpass="Pantufl4."
+########################
+
 echo "Creating new cluster..." >> output.log
 onecluster create newcluster
 echo "Creating new group..." >> output.log
 onegroup create newgroup
 
-
 # Host
 echo "Creating new hosts..." >> output.log
 onehost create host01 --im dummy --vm dummy
@@ -51,37 +57,16 @@ sleep 30
 
 onecluster addhost newcluster host03
 
+echo "Importing defaults hosts from $vcenter" >> output.log
+onevcenter hosts --vcenter $vcenter --vuser $vuser --vpass $vpass --use-defaults
+sleep 10
+
 for i in `onehost list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
     onehost show $i -x > samples/host/$i.xml
 done
 
 onehost list -x > samples/host_pool/0.xml
 
-
-# VNets
-echo "Creating new vnets..." >> output.log
-onevnet list -x > samples/vnet_pool/1.xml
-
-onevnet create test/vnet.0
-
-onevnet list -x > samples/vnet_pool/2.xml
-
-onevnet create test/vnet.1
-onevnet create test/vnet.2
-
-echo "Adding vnets to cluster..." >> output.log
-onecluster addvnet newcluster 0
-onecluster addvnet newcluster 2
-
-echo "Reserving vnet..." >> output.log
-onevnet reserve 1 --address_range 1 --size 2 --name reserve
-
-for i in `onevnet list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
-    onevnet show $i -x > samples/vnet/$i.xml
-done
-
-onevnet list -x > samples/vnet_pool/3.xml
-
 # Cluster
 echo "Creating new empty cluster..." >> output.log
 onecluster create emptycluster
@@ -92,7 +77,6 @@ done
 
 onecluster list -x > samples/cluster_pool/0.xml
 
-
 # Image
 echo "Creating new images..." >> output.log
 oneimage list -x > samples/image_pool/1.xml
@@ -116,13 +100,16 @@ echo "Adding datastores to cluster..." >> output.log
 onecluster adddatastore newcluster 100
 onecluster adddatastore newcluster 101
 
+echo "Import datastore from $vcenter" >> output.log
+onevcenter import_defaults -o datastores -h 5
+sleep 15
+
 for i in `onedatastore list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
     onedatastore show $i -x > samples/datastore/$i.xml
 done
 
 onedatastore list -x > samples/datastore_pool/0.xml
 
-
 # User
 echo "Creating new users..." >> output.log
 oneuser defaultquota test/quota.txt
@@ -130,6 +117,7 @@ oneuser defaultquota test/quota.txt
 oneuser create newuser abc
 oneuser chgrp newuser newgroup
 
+echo "Creating token for an user..." >> output.log
 echo "no" | oneuser token-create --user newuser --password abc --time 123
 echo "no" | oneuser token-create --user newuser --password abc --time 456
 echo "no" | oneuser token-create --user newuser --password abc --time 789
@@ -180,6 +168,9 @@ onetemplate create test/template.0 --user newuser --password abc
 onetemplate create test/template.1 --user newuser --password abc
 onetemplate create test/vr-template.0
 
+echo "Import templates from $vcenter" >> output.log
+onevcenter import_defaults -o templates 1..3 -h 5
+
 for i in `onetemplate list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
     onetemplate show $i -x > samples/vmtemplate/$i.xml
 done
@@ -192,8 +183,15 @@ onetemplate instantiate 0 -m 2 --user newuser --password abc
 onetemplate instantiate 1 -m 2 --user newuser --password abc
 
 # Virtual Routers
+echo "Creating new vrouters..." >> output.log
 onevrouter create test/vr.0
 onevrouter instantiate 0 vr-tmpl -m 2
+sleep 10
+for i in `onevrouter list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
+    onevrouter show $i -x > samples/vrouter/$i.xml
+done
+
+onevrouter list -x > samples/vrouter_pool/0.xml
 
 for i in `onevm list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
     onevm deploy $i host01
@@ -224,17 +222,41 @@ onevm resume 2
 
 sleep 5
 
+echo "Import wilds from $vcenter" >> output.log
+onehost importvm 'Cluster2' 'wild00 - Cluster2' >> output.log
+sleep 15
+onehost importvm 'Cluster2' 'wild01 - Cluster2' >> output.log
+sleep 15
+
 for i in `onevm list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
     onevm show $i -x > samples/vm/$i.xml
 done
 
 onevm list -x > samples/vm_pool/0.xml
 
-for i in `onevrouter list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
-    onevrouter show $i -x > samples/vrouter/$i.xml
+# VNets
+echo "Creating new vnets..." >> output.log
+onevnet list -x > samples/vnet_pool/1.xml
+
+onevnet create test/vnet.0
+
+onevnet list -x > samples/vnet_pool/2.xml
+
+onevnet create test/vnet.1
+onevnet create test/vnet.2
+
+echo "Adding vnets to cluster..." >> output.log
+onecluster addvnet newcluster 0
+onecluster addvnet newcluster 2
+
+echo "Reserving vnet..." >> output.log
+onevnet reserve 1 --address_range 1 --size 2 --name reserve
+
+for i in `onevnet list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
+    onevnet show $i -x > samples/vnet/$i.xml
 done
 
-onevrouter list -x > samples/vrouter_pool/0.xml
+onevnet list -x > samples/vnet_pool/3.xml
 
 echo "Working with markets..." >> output.log
 # Marketplace
@@ -254,6 +276,7 @@ done
 onemarketapp list -x > samples/marketplaceapp_pool/0.xml
 
 # VMGroups
+echo "Creating new vmgroups..." >> output.log
 onevmgroup list -x > samples/vm_group_pool/1.xml
 
 onevmgroup create test/vm_group.0
@@ -264,6 +287,17 @@ for i in `onevmgroup list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
     onevmgroup show $i -x > samples/vm_group/$i.xml
 done
 
+# VMGroups
+echo "Creating new servers into zone 0..." >> output.log
+onezone list -x > samples/zone_pool/1.xml
+
+onezone server-add 0 -n server-0 -r http://localhost:2633/RPC2
+
+onevmgroup list -x > samples/vm_group_pool/2.xml
+
+onezone show 0 -x > samples/zone/1.xml
+
+echo "Executing xmllint..." >> output.log
 for i in  cluster datastore group vdc host image vmtemplate user vm vnet vrouter marketplace marketplaceapp vm_group
 do
     POOL_NAME="$i""_pool"
diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd
index 677445ac9f..a2d980da68 100644
--- a/share/doc/xsd/vm.xsd
+++ b/share/doc/xsd/vm.xsd
@@ -72,8 +72,46 @@
           </xs:complexType>
         -->
         </xs:element>
-        <xs:element name="TEMPLATE" type="xs:anyType"/>
-        <xs:element name="USER_TEMPLATE" type="xs:anyType"/>
+        <xs:element name="TEMPLATE">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="DISK" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    <xs:element name="VCENTER_DS_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <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"/>
+                    <xs:element name="VCENTER_PORTGROUP_TYPE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="USER_TEMPLATE">
+          <xs:complexType>
+             <xs:sequence>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="VCENTER_CCR_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_DS_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="HISTORY_RECORDS">
           <xs:complexType>
             <xs:sequence>
diff --git a/share/doc/xsd/vmtemplate.xsd b/share/doc/xsd/vmtemplate.xsd
index ef594c0c0b..657882a151 100644
--- a/share/doc/xsd/vmtemplate.xsd
+++ b/share/doc/xsd/vmtemplate.xsd
@@ -35,7 +35,17 @@
           </xs:complexType>
         </xs:element>
         <xs:element name="REGTIME" type="xs:integer"/>
-        <xs:element name="TEMPLATE" type="xs:anyType"/>
+        <xs:element name="TEMPLATE">
+          <xs:complexType>
+             <xs:sequence>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="VCENTER_CCR_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_INSTANCE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_TEMPLATE_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/share/doc/xsd/vnet.xsd b/share/doc/xsd/vnet.xsd
index 89f0609190..9da7065343 100644
--- a/share/doc/xsd/vnet.xsd
+++ b/share/doc/xsd/vnet.xsd
@@ -58,7 +58,19 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TEMPLATE" type="xs:anyType"/>
+        <xs:element name="TEMPLATE">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+              <xs:element name="VCENTER_FROM_WILD" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <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"/>
+              <xs:element name="VCENTER_PORTGROUP_TYPE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_TEMPLATE_REF" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="AR_POOL">
           <xs:complexType>
             <xs:sequence minOccurs="0">
diff --git a/share/doc/xsd/xsd_spec.rb b/share/doc/xsd/xsd_spec.rb
index 585cc910ff..921cc1d48d 100644
--- a/share/doc/xsd/xsd_spec.rb
+++ b/share/doc/xsd/xsd_spec.rb
@@ -3,7 +3,7 @@ require 'init_functionality'
 #-------------------------------------------------------------------------------
 #-------------------------------------------------------------------------------
 describe "XSD for xml documents test" do
-    
+
 #---------------------------------------------------------------------------
   # TESTS
   #---------------------------------------------------------------------------
diff --git a/share/doc/xsd/zone.xsd b/share/doc/xsd/zone.xsd
new file mode 100644
index 0000000000..b418dfa62c
--- /dev/null
+++ b/share/doc/xsd/zone.xsd
@@ -0,0 +1,47 @@
+<?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:element name="ZONE">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="ID" type="xs:integer"/>
+        <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="VMS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TEMPLATE"/>
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ENDPOINT" type="xs:string">
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="SERVER_POOL">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="SERVER" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ENDPOINT" type="xs:string"/>
+                    <xs:element name="ID" type="xs:integer"/>
+                    <xs:element name="NAME" type="xs:string"/>
+                    <xs:element name="STATE" type="xs:integer"/>
+                    <xs:element name="TERM" type="xs:integer"/>
+                    <xs:element name="VOTEDFOR" type="xs:integer"/>
+                    <xs:element name="COMMIT" type="xs:integer"/>
+                    <xs:element name="LOG_INDEX" type="xs:integer"/>
+                    <xs:element name="FEDLOG_INDEX" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/share/doc/xsd/zone_pool.xsd b/share/doc/xsd/zone_pool.xsd
new file mode 100644
index 0000000000..41607bd37a
--- /dev/null
+++ b/share/doc/xsd/zone_pool.xsd
@@ -0,0 +1,41 @@
+<?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:element name="ZONE">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="ID" type="xs:integer"/>
+        <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="VMS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="TEMPLATE"/>
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ENDPOINT" type="xs:string">
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="SERVER_POOL">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="SERVER" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ENDPOINT" type="xs:string"/>
+                    <xs:element name="ID" type="xs:integer"/>
+                    <xs:element name="NAME" type="xs:string"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>