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

F #2347: Split rule and role logic in different objects and libraries to reuse it in scheduler

Browse Source
This commit is contained in:
Ruben S. Montero 2017-01-14 18:33:26 +01:00
parent 9fd82d980c
commit 184bd79eaf
8 changed files with 350 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/VMGroupRule.h
View File

@ -47,27 +47,7 @@ public:
/**
* @return policy name
*/
static std::string policy_to_s(Policy policy)
{
std::string name;
switch(policy)
{
case AFFINED:
name="AFFINED";
break;
case ANTI_AFFINED:
name="ANTI_AFFINED";
break;
case NONE:
name="NONE";
break;
}
return name;
}
static std::string policy_to_s(Policy policy);
/**
* A specialized set for rules

3
src/scheduler/include/VMGroupXML.h
View File

@ -18,6 +18,7 @@
#define VMGROUP_XML_H_
#include "ObjectXML.h"
#include "VMGroupRole.h"
class VMGroupXML : public ObjectXML
{
@ -40,6 +41,8 @@ public:
private:
int oid;
VMGroupRoles roles;
void init_attributes();
};

16
src/scheduler/src/pool/VMGroupXML.cc
View File

@ -18,6 +18,20 @@
void VMGroupXML::init_attributes()
{
xpath(oid, "/VM_GROUP/ID", -1);
vector<xmlNodePtr> content;
xpath(oid, "/VM_GROUP/ID", -1);
// VMGroup roles
get_nodes("/VM_GROUP/ROLES", content);
if (!content.empty())
{
roles.from_xml_node(content[0]);
}
free_nodes(content);
content.clear();
};

1
src/scheduler/src/sched/SConstruct
View File

@ -30,6 +30,7 @@ sched_env.StaticLibrary(lib_name, source_files)
sched_env.Prepend(LIBS=[
'scheduler_sched',
'scheduler_pool',
'nebula_vmgroup_roles',
'nebula_log',
'nebula_client',
'nebula_acl',

14
src/vm_group/SConstruct
View File

@ -23,8 +23,20 @@ lib_name='nebula_vmgroup'
# Sources to generate the library
source_files=[
'VMGroupPool.cc',
'VMGroup.cc'
'VMGroup.cc',
'VMGroupRole.cc',
'VMGroupRule.cc'
]
# Build library
env.StaticLibrary(lib_name, source_files)
# Stripped library for scheduler with role logic
lib_name='nebula_vmgroup_roles'
source_files=[
'VMGroupRole.cc',
'VMGroupRule.cc'
]
env.StaticLibrary(lib_name, source_files)

255
src/vm_group/VMGroup.cc
View File

@ -18,261 +18,6 @@
#include "VMGroupRole.h"
#include "VMGroupRule.h"
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
/* VMGroupRule */
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
bool VMGroupRule::compatible(VMGroupRule::rule_set& affined,
VMGroupRule::rule_set& anti, VMGroupRule& err)
{
VMGroupRule ta, taa;
rule_set::iterator it;
for (it=affined.begin() ; it != affined.end(); ++it)
{
ta |= *it;
}
for (it=anti.begin() ; it != anti.end(); ++it)
{
taa |= *it;
}
err = ta & taa;
return err.none();
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
/* VMGroupRole */
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
VMGroupRole::VMGroupRole(VectorAttribute *_va):va(_va)
{
string vms_str = va->vector_value("VMS");
if ( !vms_str.empty() )
{
one_util::split_unique(vms_str, ',', vms);
}
}
/* -------------------------------------------------------------------------- */
void VMGroupRole::add_vm(int vm_id)
{
std::pair<std::set<int>::iterator, bool> rc;
rc = vms.insert(vm_id);
if ( rc.second == false )
{
return;
}
set_vms();
}
void VMGroupRole::del_vm(int vm_id)
{
size_t rc = vms.erase(vm_id);
if ( rc == 0 )
{
return;
}
set_vms();
}
void VMGroupRole::set_vms()
{
if ( vms.empty() )
{
va->remove("VMS");
return;
}
std::string vms_str = one_util::join(vms.begin(), vms.end(), ',');
va->replace("VMS", vms_str);
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VMGroupRoles::from_xml_node(const xmlNodePtr node)
{
std::vector<VectorAttribute *> roles;
std::vector<VectorAttribute *>::iterator it;
if ( roles_template.from_xml_node(node) == -1 )
{
return -1;
}
roles_template.get("ROLE", roles);
for (it = roles.begin(); it != roles.end(); ++it)
{
std::string rname = (*it)->vector_value("NAME");
int rid;
int rc = (*it)->vector_value("ID", rid);
if ( rname.empty() || rc == -1 )
{
return -1;
}
if ( rid >= next_role )
{
next_role = rid + 1;
}
VMGroupRole * role = new VMGroupRole((*it));
if ( by_id.insert(rid, role) == false )
{
delete role;
return -1;
}
if ( by_name.insert(rname, role) == false )
{
by_id.erase(rid);
delete role;
return -1;
}
}
return 0;
}
/* -------------------------------------------------------------------------- */
int VMGroupRoles::add_role(VectorAttribute * vrole, string& error)
{
std::string rname = vrole->vector_value("NAME");
if ( rname.empty() )
{
error = "Missing NAME in VM group role";
return -1;
}
// Remove internal attributes before inserting
vrole->replace("ID", next_role);
vrole->remove("VMS");
VMGroupRole * role = new VMGroupRole(vrole);
if ( by_id.insert(next_role, role) == false )
{
delete role;
error = "Role ID already exists";
return -1;
}
if ( by_name.insert(rname, role) == false )
{
by_id.erase(next_role);
delete role;
error = "Role NAME already exists";
return -1;
}
next_role += 1;
roles_template.set(vrole);
return 0;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VMGroupRoles::add_vm(const std::string& role_name, int vmid)
{
VMGroupRole * role;
role = by_name.get(role_name);
if ( role == 0 )
{
return -1;
}
role->add_vm(vmid);
return 0;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VMGroupRoles::del_vm(const std::string& role_name, int vmid)
{
VMGroupRole * role;
role = by_name.get(role_name);
if ( role == 0 )
{
return -1;
}
role->del_vm(vmid);
return 0;
}
int VMGroupRoles::vm_size()
{
int total = 0;
for ( role_iterator it = begin(); it != end() ; ++it )
{
total += (*it)->get_vms().size();
}
return total;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VMGroupRoles::names_to_ids(const std::set<std::string> keys,
std::set<int>& keyi)
{
std::set<std::string>::iterator it;
for ( it = keys.begin(); it != keys.end(); ++it )
{
VMGroupRole *r = by_name.get(*it);
if ( r == 0 )
{
keyi.clear();
return -1;
}
keyi.insert(r->id());
}
return 0;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
/* VMGroup */

245
src/vm_group/VMGroupRole.cc Normal file
View File

@ -0,0 +1,245 @@
/* ------------------------------------------------------------------------ */
/* Copyright 2002-2016, OpenNebula Project, OpenNebula Systems */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); you may */
/* not use this file except in compliance with the License. You may obtain */
/* a copy of the License at */
/* */
/* http://www.apache.org/licenses/LICENSE-2.0 */
/* */
/* Unless required by applicable law or agreed to in writing, software */
/* distributed under the License is distributed on an "AS IS" BASIS, */
/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */
/* See the License for the specific language governing permissions and */
/* limitations under the License. */
/* -------------------------------------------------------------------------*/
#include "VMGroupRole.h"
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
/* VMGroupRole */
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
VMGroupRole::VMGroupRole(VectorAttribute *_va):va(_va)
{
string vms_str = va->vector_value("VMS");
if ( !vms_str.empty() )
{
one_util::split_unique(vms_str, ',', vms);
}
}
/* -------------------------------------------------------------------------- */
void VMGroupRole::add_vm(int vm_id)
{
std::pair<std::set<int>::iterator, bool> rc;
rc = vms.insert(vm_id);
if ( rc.second == false )
{
return;
}
set_vms();
}
void VMGroupRole::del_vm(int vm_id)
{
size_t rc = vms.erase(vm_id);
if ( rc == 0 )
{
return;
}
set_vms();
}
void VMGroupRole::set_vms()
{
if ( vms.empty() )
{
va->remove("VMS");
return;
}
std::string vms_str = one_util::join(vms.begin(), vms.end(), ',');
va->replace("VMS", vms_str);
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VMGroupRoles::from_xml_node(const xmlNodePtr node)
{
std::vector<VectorAttribute *> roles;
std::vector<VectorAttribute *>::iterator it;
if ( roles_template.from_xml_node(node) == -1 )
{
return -1;
}
roles_template.get("ROLE", roles);
for (it = roles.begin(); it != roles.end(); ++it)
{
std::string rname = (*it)->vector_value("NAME");
int rid;
int rc = (*it)->vector_value("ID", rid);
if ( rname.empty() || rc == -1 )
{
return -1;
}
if ( rid >= next_role )
{
next_role = rid + 1;
}
VMGroupRole * role = new VMGroupRole((*it));
if ( by_id.insert(rid, role) == false )
{
delete role;
return -1;
}
if ( by_name.insert(rname, role) == false )
{
by_id.erase(rid);
delete role;
return -1;
}
}
return 0;
}
/* -------------------------------------------------------------------------- */
int VMGroupRoles::add_role(VectorAttribute * vrole, string& error)
{
std::string rname = vrole->vector_value("NAME");
if ( rname.empty() )
{
error = "Missing NAME in VM group role";
return -1;
}
// Remove internal attributes before inserting
vrole->replace("ID", next_role);
vrole->remove("VMS");
VMGroupRole * role = new VMGroupRole(vrole);
if ( by_id.insert(next_role, role) == false )
{
delete role;
error = "Role ID already exists";
return -1;
}
if ( by_name.insert(rname, role) == false )
{
by_id.erase(next_role);
delete role;
error = "Role NAME already exists";
return -1;
}
next_role += 1;
roles_template.set(vrole);
return 0;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VMGroupRoles::add_vm(const std::string& role_name, int vmid)
{
VMGroupRole * role;
role = by_name.get(role_name);
if ( role == 0 )
{
return -1;
}
role->add_vm(vmid);
return 0;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VMGroupRoles::del_vm(const std::string& role_name, int vmid)
{
VMGroupRole * role;
role = by_name.get(role_name);
if ( role == 0 )
{
return -1;
}
role->del_vm(vmid);
return 0;
}
int VMGroupRoles::vm_size()
{
int total = 0;
for ( role_iterator it = begin(); it != end() ; ++it )
{
total += (*it)->get_vms().size();
}
return total;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int VMGroupRoles::names_to_ids(const std::set<std::string> keys,
std::set<int>& keyi)
{
std::set<std::string>::iterator it;
for ( it = keys.begin(); it != keys.end(); ++it )
{
VMGroupRole *r = by_name.get(*it);
if ( r == 0 )
{
keyi.clear();
return -1;
}
keyi.insert(r->id());
}
return 0;
}

72
src/vm_group/VMGroupRule.cc Normal file
View File

@ -0,0 +1,72 @@
/* ------------------------------------------------------------------------ */
/* Copyright 2002-2016, OpenNebula Project, OpenNebula Systems */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); you may */
/* not use this file except in compliance with the License. You may obtain */
/* a copy of the License at */
/* */
/* http://www.apache.org/licenses/LICENSE-2.0 */
/* */
/* Unless required by applicable law or agreed to in writing, software */
/* distributed under the License is distributed on an "AS IS" BASIS, */
/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */
/* See the License for the specific language governing permissions and */
/* limitations under the License. */
/* -------------------------------------------------------------------------*/
#include "VMGroup.h"
#include "VMGroupRole.h"
#include "VMGroupRule.h"
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
/* VMGroupRule */
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
bool VMGroupRule::compatible(VMGroupRule::rule_set& affined,
VMGroupRule::rule_set& anti, VMGroupRule& err)
{
VMGroupRule ta, taa;
rule_set::iterator it;
for (it=affined.begin() ; it != affined.end(); ++it)
{
ta |= *it;
}
for (it=anti.begin() ; it != anti.end(); ++it)
{
taa |= *it;
}
err = ta & taa;
return err.none();
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
std::string VMGroupRule::policy_to_s(Policy policy)
{
std::string name;
switch(policy)
{
case AFFINED:
name="AFFINED";
break;
case ANTI_AFFINED:
name="ANTI_AFFINED";
break;
case NONE:
name="NONE";
break;
}
return name;
}