shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

Feature #1556: Move all the attributes used in the code to the internal template

Browse Source
This commit is contained in:
Carlos Martín 2013-02-26 13:03:40 +01:00
parent 1f37cbffbe
commit f1ee01cffa
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/VirtualMachine.h
View File

@ -1192,6 +1192,12 @@ private:
*/ */
void parse_graphics(); void parse_graphics();
/**
* Searches the meaningful attributes and moves them from the user template
* to the internal template
*/
void parse_well_known_attributes();
/** /**
* Function that renders the VM in XML format optinally including * Function that renders the VM in XML format optinally including
* extended information (all history records) * extended information (all history records)

43
src/vm/VirtualMachine.cc
View File

@ -392,6 +392,8 @@ int VirtualMachine::insert(SqlDB * db, string& error_str)
parse_graphics(); parse_graphics();
parse_well_known_attributes();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Insert the VM // Insert the VM
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -866,6 +868,47 @@ error_cleanup:
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
void VirtualMachine::parse_well_known_attributes()
{
/*
* List of meaningful attributes, used in other places and expected in
* obj_template:
*
* DISK
* NIC
* VCPU
* MEMORY
* CPU
* CONTEXT
* OS
* GRAPHICS
*
* INPUT
* FEATURES
* RAW
*/
vector<Attribute *> v_attr;
vector<Attribute *>::iterator it;
string names[] = {"INPUT", "FEATURES", "RAW"};
for (int i=0; i<3; i++)
{
v_attr.clear();
user_obj_template->remove(names[i], v_attr);
for (it=v_attr.begin(); it != v_attr.end(); it++)
{
obj_template->set(*it);
}
}
}
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
static int check_and_set_cluster_id(const char * id_name, static int check_and_set_cluster_id(const char * id_name,
VectorAttribute * vatt, VectorAttribute * vatt,
string& cluster_id) string& cluster_id)