shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Feature #1112: Add automatic cluster placement requirements to new VMs

Browse Source
This commit is contained in:
Carlos Martín 2012-03-05 16:20:04 +01:00
parent c2069ea215
commit 20ff34756c
4 changed files with 148 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/VirtualMachine.h
View File

@ -865,6 +865,14 @@ private:
*/
int parse_requirements(string& error_str);
/**
* Adds automatic placement requirements: Datastore and Cluster
*
* @param error_str Returns the error reason, if any
* @return 0 on success
*/
int automatic_requirements(string& error_str);
/**
* Parse the "GRAPHICS" attribute and generates a default PORT if not
* defined

8
src/datastore/Datastore.cc
View File

@ -72,6 +72,14 @@ int Datastore::disk_attribute(VectorAttribute * disk)
disk->replace("DATASTORE_ID", oss.str());
disk->replace("TM_MAD", get_tm_mad());
if ( get_cluster_id() != ClusterPool::NONE_CLUSTER_ID )
{
oss.str("");
oss << get_cluster_id();
disk->replace("CLUSTER_ID", oss.str());
}
return 0;
}

121
src/vm/VirtualMachine.cc
View File

@ -289,6 +289,13 @@ int VirtualMachine::insert(SqlDB * db, string& error_str)
goto error_requirements;
}
rc = automatic_requirements(error_str);
if ( rc != 0 )
{
goto error_requirements;
}
parse_graphics();
// ------------------------------------------------------------------------
@ -519,6 +526,118 @@ int VirtualMachine::parse_requirements(string& error_str)
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
int VirtualMachine::automatic_requirements(string& error_str)
{
int num_vatts;
vector<Attribute * > v_attributes;
VectorAttribute * vatt;
ostringstream oss;
string requirements;
string cluster_id;
bool error = false;
oss << "Incompatible cluster IDs.";
// Get cluster id from all DISK vector attributes
num_vatts = obj_template->get("DISK",v_attributes);
for(int i=0; i<num_vatts; i++)
{
vatt = dynamic_cast<VectorAttribute * >(v_attributes[i]);
if ( vatt == 0 )
{
continue;
}
string vatt_cluster_id = vatt->vector_value("CLUSTER_ID");
if ( !vatt_cluster_id.empty() )
{
oss << endl << "DISK [" << i << "]: IMAGE ["
<< vatt->vector_value("IMAGE_ID") << "] from DATASTORE ["
<< vatt->vector_value("DATASTORE_ID") << "] requires CLUSTER ["
<< vatt_cluster_id << "]";
if ( cluster_id.empty() )
{
cluster_id = vatt_cluster_id;
}
else if ( cluster_id != vatt_cluster_id )
{
error = true;
}
}
}
// Get cluster id from all NIC vector attributes
v_attributes.clear();
num_vatts = obj_template->get("NIC",v_attributes);
for(int i=0; i<num_vatts; i++)
{
vatt = dynamic_cast<VectorAttribute * >(v_attributes[i]);
if ( vatt == 0 )
{
continue;
}
string vatt_cluster_id = vatt->vector_value("CLUSTER_ID");
if ( !vatt_cluster_id.empty() )
{
oss << endl << "NIC [" << i << "]: NETWORK ["
<< vatt->vector_value("NETWORK_ID") << "] requires CLUSTER ["
<< vatt_cluster_id << "]";
if ( cluster_id.empty() )
{
cluster_id = vatt_cluster_id;
}
else if ( cluster_id != vatt_cluster_id )
{
error = true;
}
}
}
if ( error == true )
{
error_str = oss.str();
return -1;
}
if ( !cluster_id.empty() )
{
oss.str("");
oss << "CLUSTER_ID = " << cluster_id;
obj_template->get("REQUIREMENTS", requirements);
if ( !requirements.empty() )
{
oss << " & ( " << requirements << " )";
}
SingleAttribute * reqs_att;
obj_template->erase("REQUIREMENTS");
reqs_att = new SingleAttribute("REQUIREMENTS",oss.str());
obj_template->set(reqs_att);
}
return 0;
}
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
int VirtualMachine::insert_replace(SqlDB *db, bool replace, string& error_str)
{
ostringstream oss;
@ -1412,4 +1531,4 @@ string VirtualMachine::get_system_dir() const
oss << nd.get_ds_location() << DatastorePool::SYSTEM_DS_ID << "/"<< oid;
return oss.str();
};
};

15
src/vnm/VirtualNetwork.cc
View File

@ -24,6 +24,7 @@
#include "FixedLeases.h"
#include "AuthManager.h"
#include "ClusterPool.h"
#define TO_UPPER(S) transform(S.begin(),S.end(),S.begin(),(int(*)(int))toupper)
@ -626,10 +627,10 @@ int VirtualNetwork::nic_attribute(VectorAttribute *nic, int vid)
string ip;
string mac;
ostringstream vnid;
ostringstream oss;
ip = nic->vector_value("IP");
vnid << oid;
oss << oid;
//--------------------------------------------------------------------------
// GET NETWORK LEASE
@ -654,7 +655,7 @@ int VirtualNetwork::nic_attribute(VectorAttribute *nic, int vid)
//--------------------------------------------------------------------------
nic->replace("NETWORK" ,name);
nic->replace("NETWORK_ID",vnid.str());
nic->replace("NETWORK_ID",oss.str());
nic->replace("BRIDGE" ,bridge);
nic->replace("MAC" ,mac);
nic->replace("IP" ,ip);
@ -678,6 +679,14 @@ int VirtualNetwork::nic_attribute(VectorAttribute *nic, int vid)
nic->replace("VLAN_ID", vlan_id);
}
if ( get_cluster_id() != ClusterPool::NONE_CLUSTER_ID )
{
oss.str("");
oss << get_cluster_id();
nic->replace("CLUSTER_ID", oss.str());
}
return 0;
}