Trunk now is OpenNebula 1.3. New raw XML vmm drvier type. updated date in license

git-svn-id: http://svn.opennebula.org/one/trunk@330 3034c82b-c49b-4eb3-8279-a7acafdc01c0

include/ActionManager.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/Attribute.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */
@@ -73,6 +73,13 @@ public:
      *    @return a string (allocated in the heap) holding the attribute value.
      */
     virtual string * marshall(const char * _sep = 0) = 0;
+    
+    /**
+     *  Write the attribute using a simple XML format. The string MUST be freed
+     *  by the calling function.
+     *    @return a string (allocated in the heap) holding the attribute value.
+     */
+    virtual string * to_xml() const = 0;
 
     /**
      *  Builds a new attribute from a string.
@@ -135,7 +142,25 @@ public:
         
         return rs;   
     };
-
+    
+    /**
+     *  Write the attribute using a simple XML format:
+     * 
+     *  <attribute_name>attribute_value</attribute_name> 
+     * 
+     *  The string MUST be freed by the calling function.
+     *    @return a string (allocated in the heap) holding the attribute value.
+     */
+    string * to_xml() const
+    {
+    	string * xml = new string;
+    	
+    	*xml = "<" + name() + ">" + attribute_value
+    		 + "</"+ name() + ">";
+    	
+    	return xml;
+    }
+        
     /**
      *  Builds a new attribute from a string.
      */    
@@ -204,6 +229,20 @@ public:
      *    @return a string (allocated in the heap) holding the attribute value.
      */    
     string * marshall(const char * _sep = 0);
+    
+    /**
+     *  Write the attribute using a simple XML format:
+     * 
+     *  <attribute_name>
+     *    <val_name_1>val_value_1</val_name_1>
+     *    ...
+     *    <val_name_n>val_value_n</val_name_n>
+     *  </attribute_name> 
+     * 
+     *  The string MUST be freed by the calling function.
+     *    @return a string (allocated in the heap) holding the attribute value.
+     */
+    string * to_xml() const;
 
     /**
      *  Builds a new attribute from a string of the form:

include/DispatchManager.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/EC2Driver.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/FixedLeases.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/History.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/Host.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/HostPool.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/HostShare.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/HostTemplate.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/InformationManager.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/InformationManagerDriver.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/Leases.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/LibVirtDriver.h

@@ -1,3 +1,20 @@
+/* -------------------------------------------------------------------------- */    
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */    
+/* Complutense de Madrid (dsa-research.org)                                   */    
+/*                                                                            */    
+/* 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    */    
+/* a copy of the License at                                                   */    
+/*                                                                            */    
+/* http://www.apache.org/licenses/LICENSE-2.0                                 */    
+/*                                                                            */    
+/* Unless required by applicable law or agreed to in writing, software        */    
+/* distributed under the License is distributed on an "AS IS" BASIS,          */    
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   */    
+/* See the License for the specific language governing permissions and        */    
+/* limitations under the License.                                             */    
+/* -------------------------------------------------------------------------- */   
+
 #ifndef LIBVIRT_DRIVER_H_
 #define LIBVIRT_DRIVER_H_
 

include/LifeCycleManager.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/Log.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/Mad.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/MadManager.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/Nebula.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */
@@ -211,7 +211,7 @@ public:
     
     static string version()
     {
-        return "ONE1.1.85";   
+        return "OpenNebula 1.3.0";   
     };
     
     void start();

include/NebulaTemplate.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/ObjectSQL.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/OneClient.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/PoolObjectSQL.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/PoolSQL.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/RangedLeases.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/RequestManager.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/Scheduler.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/SchedulerHost.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/SchedulerPolicy.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/SchedulerVirtualMachine.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/SqliteDB.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/Template.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */
@@ -74,6 +74,20 @@ public:
      *    @param delim to separate attributes
      */
     void marshall(string &str, const char delim='\n');
+
+    /**
+     *  Writes the template in a simple xml string:
+     *  <template>
+     *    <single>value</single>
+     *    <vector>
+     *      <attr>value</attr>
+     *      ...
+     *    </vector>
+     *    ...
+     *  </template>
+     *    @param xml string that hold the xml template representation
+     */
+    void to_xml(string& xml) const;
     
     /**
      *  Sets a new attribute, the attribute MUST BE ALLOCATED IN THE HEAP, and

include/TemplateSQL.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/TransferManager.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/TransferManagerDriver.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/VirtualMachine.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */
@@ -537,6 +537,15 @@ public:
         vm_template.get(str,value);        
     }
     
+    /**
+     *  Generates a XML string for the template of the VM
+     *    @param xml the string to store the XML description.
+     */
+    void template_to_xml(string &xml) const
+    {
+        vm_template.to_xml(xml);        
+    }
+    
     // ------------------------------------------------------------------------
     // States
     // ------------------------------------------------------------------------    

include/VirtualMachineManager.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/VirtualMachineManagerDriver.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/VirtualMachinePool.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/VirtualMachineTemplate.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/VirtualNetwork.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/VirtualNetworkPool.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/VirtualNetworkTemplate.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

include/XenDriver.h

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2008, Distributed Systems Architecture Group, Universidad   */
+/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad   */
 /* Complutense de Madrid (dsa-research.org)                                   */
 /*                                                                            */
 /* Licensed under the Apache License, Version 2.0 (the "License"); you may    */

src/client/ruby/command_parse.rb

@@ -33,7 +33,7 @@ Options:
 EOT
 
     ONE_VERSION=<<-EOT
-OpenNebula release 1.1.80 (2008/12/02)
+OpenNebula 1.3.0
 Copyright 2002-2008, Distributed Systems Architecture Group, Universidad
 Complutense de Madrid (dsa-research.org)
 

src/common/Attribute.cc

@@ -61,6 +61,33 @@ string * VectorAttribute::marshall(const char * _sep)
     return rs;
 }
 
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+string * VectorAttribute::to_xml() const
+{
+	map<string,string>::const_iterator    it;
+	ostringstream                   oss;
+	string * 						xml;
+	
+	oss << "<" << name() << ">";
+	
+	for (it=attribute_value.begin();it!=attribute_value.end();it++)
+	{
+		oss << "<" << it->first << ">" << it->second 
+			<< "</"<< it->first << ">";
+	}
+	
+	oss << "</"<< name() << ">";
+	
+	xml = new string;
+	
+	*xml = oss.str();
+	
+	return xml;
+}    
+
+
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 

src/template/Template.cc

@@ -255,6 +255,31 @@ void Template::get(
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+void Template::to_xml(string& xml) const
+{
+    multimap<string,Attribute *>::const_iterator  it;
+    ostringstream                   		oss;
+    string *                                s;
+    
+    oss << "<template>";
+    
+    for ( it = attributes.begin(); it!=attributes.end(); it++)
+    {
+        s = it->second->to_xml();
+
+        oss << *s;
+
+        delete s;
+    }
+    
+    oss << "</template>";
+    
+    xml = oss.str();
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 ostream& operator << (ostream& os, Template& t)
 {
     multimap<string,Attribute *>::iterator  it;
@@ -274,3 +299,4 @@ ostream& operator << (ostream& os, Template& t)
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
+

src/vmm/SConstruct

@@ -27,7 +27,8 @@ source_files=[
 	'VirtualMachineManagerDriver.cc',
 	'XenDriver.cc',
 	'LibVirtDriver.cc',
-	'EC2Driver.cc'
+	'EC2Driver.cc',
+	'XMLDriver.cc'
 ]
 
 # Build library

src/vmm/VirtualMachineManager.cc

@@ -18,6 +18,7 @@
 #include "VirtualMachineManager.h"
 #include "Nebula.h"
 #include "XenDriver.h"
+#include "XMLDriver.h"
 #include "LibVirtDriver.h"
 #include "EC2Driver.h"
 #include <time.h>
@@ -794,7 +795,11 @@ void VirtualMachineManager::load_mads(int uid)
         else if ( type == "EC2" )
         {
         	vmm_driver = new EC2Driver(uid, vattr->value(),(uid != 0),vmpool);
-        }        
+        }
+        else if ( type == "XML" )
+        {
+        	vmm_driver = new XMLDriver(uid, vattr->value(),(uid != 0),vmpool);
+        }
         else
         {
         	oss.str("");