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

Feature #2435 #2092: New generic HYBRID section in VMs, better automatic_requirements

Browse Source
This commit is contained in:
Carlos Martín 2013-11-20 17:02:12 +01:00 committed by Javi Fontan
parent e0ad89343c
commit 637f1dbbd2
3 changed files with 85 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/VirtualMachine.h
View File

@ -1388,6 +1388,22 @@ public:
*/
void delete_snapshots();
// ------------------------------------------------------------------------
// Hybrid templates related functions
// ------------------------------------------------------------------------
/**
* Checks if the VM is hybrid
* @return true if the VM is hybrid
*/
bool is_hybrid() const;
/**
* Gets the list of hybrid hypervisors for which this VM has definitions
* @return the list of hybrid hypervisors
*/
vector<string> get_hybrid_hypervisors() const;
private:
// -------------------------------------------------------------------------

13
src/host/Host.cc
View File

@ -540,20 +540,9 @@ error_common:
bool Host::isHybrid() const
{
string hypervisor;
bool is_hybrid = false;
get_template_attribute("HYPERVISOR", hypervisor);
one_util::toupper(hypervisor);
for(int i=0; i < NUM_HYBRID_HYPERVISORS; i++)
{
if(hypervisor==HYBRID_HYPERVISORS[i])
{
is_hybrid = true;
break;
}
}
get_template_attribute("HYBRID", is_hybrid);
return is_hybrid;
}

78
src/vm/VirtualMachine.cc
View File

@ -1129,7 +1129,8 @@ int VirtualMachine::automatic_requirements(string& error_str)
ostringstream oss;
string requirements;
string cluster_id = "";
string hypervisor;
vector<string> hybrid_hypervisors = get_hybrid_hypervisors();
int incomp_id;
int rc;
@ -1208,23 +1209,28 @@ int VirtualMachine::automatic_requirements(string& error_str)
if ( !cluster_id.empty() )
{
oss << "CLUSTER_ID = " << cluster_id;
oss << "CLUSTER_ID = " << cluster_id << " & !(HYBRID = YES)";
}
else
{
oss << "!(HYBRID = YES)";
}
if (static_cast<VirtualMachineTemplate*>(obj_template)->get_hybrid_hypervisor(hypervisor))
if (!hybrid_hypervisors.empty())
{
if ( !cluster_id.empty() )
oss << " | (HYBRID = YES & (";
oss << "HYPERVISOR = " << hybrid_hypervisors[0];
for (size_t i = 1; i < hybrid_hypervisors.size(); i++)
{
oss << " || ";
oss << " | HYPERVISOR = " << hybrid_hypervisors[i];
}
oss << "HYPERVISOR = " << hypervisor;
oss << "))";
}
if ( !cluster_id.empty() || !hypervisor.empty() )
{
obj_template->add("AUTOMATIC_REQUIREMENTS", oss.str());
}
obj_template->add("AUTOMATIC_REQUIREMENTS", oss.str());
return 0;
@ -3656,3 +3662,55 @@ void VirtualMachine::clear_template_monitor_error()
{
user_obj_template->erase("ERROR_MONITOR");
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
bool VirtualMachine::is_hybrid() const
{
vector<string> v = get_hybrid_hypervisors();
return (v.size() > 0);
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
vector<string> VirtualMachine::get_hybrid_hypervisors() const
{
vector<Attribute*> attrs;
vector<Attribute*>::const_iterator it;
VectorAttribute * vatt;
vector<string> hybrid_hypervisors;
user_obj_template->get("HYBRID", attrs);
for (it = attrs.begin(); it != attrs.end(); it++)
{
vatt = dynamic_cast<VectorAttribute * >(*it);
if ( vatt == 0 )
{
continue;
}
string type = vatt->vector_value("TYPE");
if (!type.empty())
{
hybrid_hypervisors.push_back(type);
}
}
// Compatibility with old templates
user_obj_template->get("EC2", attrs);
if (!attrs.empty())
{
hybrid_hypervisors.push_back("ec2");
}
return hybrid_hypervisors;
}