shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-24 02:03:52 +03:00
Code Releases Wiki Activity

feature #1727: Rename disk_target to disk_tm_target

Browse Source
This commit is contained in:
Ruben S. Montero 2015-07-29 12:40:21 +02:00
parent 6fb47ac1be
commit 2d1b92fc24
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/VirtualMachine.h
View File

@ -1282,7 +1282,7 @@ public:
* @param disk
* @return NONE, SYSTEM, SELF. Empty string if it could not be determined
*/
static string disk_target(const VectorAttribute * disk);
static string disk_tm_target(const VectorAttribute * disk);
/**
* Returns a set of the security group IDs in use in this VM

2
src/rm/RequestManagerVirtualMachine.cc
View File

@ -2434,7 +2434,7 @@ void VirtualMachineDiskSnapshotCreate::request_execute(
}
//--------------------- Account for System DS storage ----------------------
do_vm_quota = (VirtualMachine::disk_target(disk) != "NONE"); // self or system
do_vm_quota = (VirtualMachine::disk_tm_target(disk) != "NONE");// self or system
if (do_vm_quota)
{

6
src/vm/VirtualMachine.cc
View File

@ -2345,7 +2345,7 @@ long long VirtualMachine::get_system_disk_size(Template * tmpl)
{
size += disk_size;
}
else if ( disk_target(disk) != "NONE") // self or system
else if ( disk_tm_target(disk) != "NONE") // self or system
{
size += disk_size;
@ -2362,7 +2362,7 @@ long long VirtualMachine::get_system_disk_size(Template * tmpl)
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
string VirtualMachine::disk_target(const VectorAttribute * disk)
string VirtualMachine::disk_tm_target(const VectorAttribute * disk)
{
bool clone;
string target;
@ -4434,7 +4434,7 @@ void VirtualMachine::delete_disk_snapshot(int did, int snap_id,
(*ds_quotas)->add("IMAGES",0 );
}
if (disk_target(disk) != "NONE") // self or system
if (disk_tm_target(disk) != "NONE") // self or system
{
*vm_quotas = new Template();