shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

feature-#1112: Add remote_system_dir for Virtual Machines

Browse Source
This commit is contained in:
Ruben S. Montero 2012-02-25 01:25:28 +01:00
parent 80b49ff6b4
commit 7279fc1b96
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/VirtualMachine.h
View File

@ -783,6 +783,12 @@ private:
*/
string system_dir;
/**
* Directory for the VM in hosts, the System DS (system_ds_path/$VID). Defaults to
* $ONE_LOCATION/var/system_ds/$VID or /var/log/one/system_ds/$VID
*/
string remote_system_dir;
// *************************************************************************
// DataBase implementation (Private)
// *************************************************************************

21
src/vm/VirtualMachine.cc
View File

@ -57,7 +57,8 @@ VirtualMachine::VirtualMachine(int id,
history(0),
previous_history(0),
_log(0),
system_dir("")
system_dir(""),
remote_system_dir("")
{
if (_vm_template != 0)
{
@ -152,7 +153,7 @@ int VirtualMachine::select(SqlDB * db)
if ( state == DONE ) //Do not recreate dirs. They may be deleted
{
_log = 0;
return 0;
}
@ -204,6 +205,8 @@ int VirtualMachine::insert(SqlDB * db, string& error_str)
SingleAttribute * attr;
string aname;
string value;
string ds_location;
ostringstream oss;
Nebula& nd = Nebula::instance();
@ -296,14 +299,20 @@ int VirtualMachine::insert(SqlDB * db, string& error_str)
parse_graphics();
// ------------------------------------------------------------------------
// Set the System DataStore Path for the VM
// Set the System DataStore Paths for the VM
// ------------------------------------------------------------------------
oss.str("");
oss << nd.get_system_ds_path() << "/" << oid;
system_dir = oss.str();
oss.str("");
nd.get_configuration_attribute("DATASTORE_LOCATION", ds_location);
oss << ds_location << "/" << DatastorePool::SYSTEM_DS_NAME << "/" << oid;
remote_system_dir = oss.str();
// ------------------------------------------------------------------------
// Insert the VM
// ------------------------------------------------------------------------
@ -1284,7 +1293,8 @@ string& VirtualMachine::to_xml_extended(string& xml, bool extended) const
<< "<CPU>" << cpu << "</CPU>"
<< "<NET_TX>" << net_tx << "</NET_TX>"
<< "<NET_RX>" << net_rx << "</NET_RX>"
<< "<SYSTEM_DIR>"<< system_dir<< "</SYSTEM_DIR>"
<< "<SYSTEM_DIR>" << system_dir << "</SYSTEM_DIR>"
<< "<REMOTE_SYSTEM_DIR>" << remote_system_dir << "</REMOTE_SYSTEM_DIR>"
<< obj_template->to_xml(template_xml);
if ( hasHistory() )
@ -1355,6 +1365,7 @@ int VirtualMachine::from_xml(const string &xml_str)
rc += xpath(net_rx, "/VM/NET_RX", 0);
rc += xpath(system_dir,"/VM/SYSTEM_DIR","not_found");
rc += xpath(remote_system_dir,"/VM/REMOTE_SYSTEM_DIR","not_found");
// Permissions
rc += perms_from_xml();