From e9b21c84d1941abc24f357341e52a3c96e162ea4 Mon Sep 17 00:00:00 2001 From: Carlos Martin Date: Mon, 17 May 2010 23:19:20 +0200 Subject: [PATCH] feature #212: More tests for the scheduler --- src/scheduler/src/pool/test/HostXMLTest.cc | 275 +++++++-- .../src/pool/test/VirtualMachineXMLTest.cc | 575 +++++++++--------- 2 files changed, 507 insertions(+), 343 deletions(-) diff --git a/src/scheduler/src/pool/test/HostXMLTest.cc b/src/scheduler/src/pool/test/HostXMLTest.cc index 2c8a62e57e..786f66ffa4 100644 --- a/src/scheduler/src/pool/test/HostXMLTest.cc +++ b/src/scheduler/src/pool/test/HostXMLTest.cc @@ -42,8 +42,32 @@ public: friend class HostXMLTest; static const string host_dump; + static const string xmls[]; protected: + + void add_object(xmlNodePtr node) + { + xmlNodePtr nodeID; + + xmlChar * str_ptr = xmlNodeGetContent(node->children->next); + + int hid; + + if (str_ptr != 0) + { + hid = atoi(reinterpret_cast(str_ptr)); + xmlFree(str_ptr); + } + else + { + + } + + HostXML* vm = new HostXML( xmls[hid] ); + objects.insert( pair(hid, vm) ); + }; + int load_info(xmlrpc_c::value &result) { vector arrayData; @@ -118,11 +142,14 @@ public: CPPUNIT_ASSERT( rc == 0 ); CPPUNIT_ASSERT( hp->objects.size() == 4 ); - CPPUNIT_ASSERT( hp->objects.count(0) == 1); + CPPUNIT_ASSERT( hp->objects.count(0) == 0); CPPUNIT_ASSERT( hp->objects.count(1) == 1); - CPPUNIT_ASSERT( hp->objects.count(2) == 0); - CPPUNIT_ASSERT( hp->objects.count(3) == 1); + CPPUNIT_ASSERT( hp->objects.count(2) == 1); + CPPUNIT_ASSERT( hp->objects.count(3) == 0); CPPUNIT_ASSERT( hp->objects.count(4) == 1); + CPPUNIT_ASSERT( hp->objects.count(5) == 1); + CPPUNIT_ASSERT( hp->objects.count(6) == 0); + CPPUNIT_ASSERT( hp->objects.count(7) == 0); }; void get_capacity() @@ -141,7 +168,7 @@ public: int cpu, mem, threshold; threshold = 100; - HostXML* host = (HostXML*) hp->objects[4]; + HostXML* host = (HostXML*) hp->objects[5]; CPPUNIT_ASSERT(host != 0); host->get_capacity(cpu, mem, threshold); @@ -162,7 +189,7 @@ public: CPPUNIT_ASSERT( hp->objects.size() == 4 ); - HostXML* host = (HostXML*) hp->objects[4]; + HostXML* host = (HostXML*) hp->objects[5]; CPPUNIT_ASSERT(host != 0); /* @@ -205,7 +232,7 @@ public: CPPUNIT_ASSERT( hp->objects.size() == 4 ); - HostXML* host = (HostXML*) hp->objects[4]; + HostXML* host = (HostXML*) hp->objects[5]; CPPUNIT_ASSERT(host != 0); // add cpu, mem, disk @@ -232,68 +259,196 @@ public: int main(int argc, char ** argv) { + // We need to set the log file + NebulaLog::init_log_system(NebulaLog::FILE, Log::DEBUG, "test.log"); + NebulaLog::log("Test", Log::INFO, "Test started"); + CppUnit::TextUi::TestRunner runner; runner.addTest(HostXMLTest::suite()); runner.run(); + +// remove("test.log"); + NebulaLog::finalize_log_system(); + return 0; } // ---------------------------------------------------------------------------- +const string FriendHostPool::xmls[] = +{ +"", + +"\ + 1\ + ursa12\ + 2\ + im_kvm\ + vmm_kvm\ + tm_nfs\ + 1274107238\ + \ + 1\ + 0\ + 0\ + 0\ + 0\ + 8194368\ + 800\ + 0\ + 7954812\ + 800\ + 0\ + 536220\ + 0\ + 0\ + \ + \ +", + +"\ + 2\ + ursa\ + 2\ + im_kvm\ + vmm_kvm\ + tm_nfs\ + 1274107299\ + \ + 2\ + 0\ + 4280320\ + 700\ + 0\ + 16468252\ + 800\ + 0\ + 9104256\ + 613\ + 0\ + 13897924\ + 186\ + 7\ + \ + \ +", + +"", + +"\ + 4\ + ursa11\ + 2\ + im_kvm\ + vmm_kvm\ + tm_nfs\ + 1274107328\ + \ + 4\ + 0\ + 0\ + 0\ + 0\ + 8194368\ + 800\ + 0\ + 7958684\ + 800\ + 0\ + 621616\ + 0\ + 0\ + \ + \ +", + +"\ + 5\ + ursa10\ + 2\ + im_kvm\ + vmm_kvm\ + tm_nfs\ + 1274107300\ + \ + 5\ + 256\ + 128\ + 20\ + 512\ + 512\ + 200\ + 256\ + 384\ + 180\ + 0\ + 2191756\ + 6\ + 0\ + \ + \ +" +}; + const string FriendHostPool::host_dump = - "0a0im_madvmm_madtm_mad000000" - "000000000000000000" - "1a name1im_madvmm_madtm_mad0000000000100000" - "000000002a_name3im_madvmm_madtm_mad0000000000200000000000003another " - "name2im_madvmm_mad" - "tm_mad000000000030000000000000" - "" -" 4" -" host" -" 0" -" im_mad" -" vmm_mad" -" tm_mad" -" 0000000000" -" " -" 4" -" 256" -" 128" -" 20" -" 512" -" 512" -" 200" -" 256" -" 384" -" 180" -" 256" -" 128" -" 20" -" 0" -" " -" " -""; +" 1 ursa12 2 im_kvm vmm_kvm tm_nfs 1274107145 1 0 0 0 0 8194368 800 0 7955180 800 0 535848 0 0 2 ursa 2 im_kvm vmm_kvm tm_nfs 1274107206 2 0 4280320 700 0 16468252 800 0 9109156 628 0 13891232 172 7 4 ursa11 2 im_kvm vmm_kvm tm_nfs 1274107145 4 0 0 0 0 8194368 800 0 7958684 800 0 621616 0 0 5 ursa10 2 im_kvm vmm_kvm tm_nfs 1274107207 5 0 0 0 0 8194368 800 0 7870776 796 0 2192424 4 0 6 ursa08 3 im_kvm vmm_kvm tm_nfs 1274107176 6 0 0 0 0 0 0 0 6585200 0 0 1132608 0 0 7 ursa09 3 im_kvm vmm_kvm tm_nfs 1274107146 7 0 524288 100 0 8194368 800 0 7286128 798 0 8011908 1 1 "; + + diff --git a/src/scheduler/src/pool/test/VirtualMachineXMLTest.cc b/src/scheduler/src/pool/test/VirtualMachineXMLTest.cc index 2ecd13d435..bfee161dc0 100644 --- a/src/scheduler/src/pool/test/VirtualMachineXMLTest.cc +++ b/src/scheduler/src/pool/test/VirtualMachineXMLTest.cc @@ -30,15 +30,68 @@ #include "ObjectXML.h" #include "VirtualMachinePoolXML.h" +#include "HostPoolXML.h" /* ************************************************************************* */ /* ************************************************************************* */ +class FriendHostPool : public HostPoolXML +{ +public: + FriendHostPool(Client* client):HostPoolXML(client){}; + + friend class HostXMLTest; + + static const string host_dump; + static const string xmls[]; + +protected: + + void add_object(xmlNodePtr node) + { + xmlNodePtr nodeID; + + xmlChar * str_ptr = xmlNodeGetContent(node->children->next); + + int hid; + + if (str_ptr != 0) + { + hid = atoi(reinterpret_cast(str_ptr)); + xmlFree(str_ptr); + } + else + { + + } + + HostXML* vm = new HostXML( xmls[hid] ); + objects.insert( pair(hid, vm) ); + }; + + int load_info(xmlrpc_c::value &result) + { + vector arrayData; + arrayData.push_back(xmlrpc_c::value_boolean(true)); + arrayData.push_back(xmlrpc_c::value_string(host_dump)); + + // Make an XML-RPC array out of it + xmlrpc_c::value_array array(arrayData); + result = array; + + return 0; + }; +}; class FriendVirtualMachinePool : public VirtualMachinePoolXML { public: - FriendVirtualMachinePool(Client* client):VirtualMachinePoolXML(client){}; + FriendVirtualMachinePool + ( + Client* client, + unsigned int m_limit = 0 + ):VirtualMachinePoolXML(client, m_limit){}; + friend class VirtualMachineXMLTest; static const string vm_dump; @@ -54,6 +107,7 @@ protected: xmlChar * str_ptr = xmlNodeGetContent(nodeID); + int vid; if (str_ptr != 0) @@ -63,7 +117,7 @@ protected: } else { - // TODO WHAT DO? + // TODO } VirtualMachineXML* vm = new VirtualMachineXML( xmls[vid] ); @@ -93,10 +147,7 @@ class VirtualMachineXMLTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE( VirtualMachineXMLTest ); CPPUNIT_TEST( initialization ); - - CPPUNIT_TEST( add_host ); - CPPUNIT_TEST( set_priorities ); CPPUNIT_TEST( get_host ); CPPUNIT_TEST_SUITE_END (); @@ -106,6 +157,16 @@ private: FriendVirtualMachinePool * vmp; + FriendHostPool* set_up_hpool() + { + FriendHostPool* hpool; + + hpool = new FriendHostPool(NULL); + hpool->set_up(); + + return hpool; + }; + public: VirtualMachineXMLTest(){}; @@ -187,24 +248,59 @@ public: CPPUNIT_ASSERT( mh[2] == 4 ); }; - void set_priorities() - { - // TODO - }; void get_host() { - int rc; - VirtualMachineXML* vm; - + VirtualMachineXML* vm; + HostPoolXML* hpool; + vector priorities; + int hid; + int rc; CPPUNIT_ASSERT( vmp != 0 ); rc = vmp->set_up(); CPPUNIT_ASSERT( rc == 0 ); - // TODO jugar con las VM y Host y mirar que cada VM coje el Host - // que deberĂ­a segĂșn sus requirements. + hpool = set_up_hpool(); + CPPUNIT_ASSERT( hpool != 0 ); + + + vm = vmp->get(0); + CPPUNIT_ASSERT( vm != 0 ); + + rc = vm->get_host(hid, hpool); + CPPUNIT_ASSERT( rc == -1 ); + + // get_host will iterate in reverse order the available hosts, and + // return the first to fit the requirements; in this case + // cpu: 50 mem: 128 + vm->add_host( 5 ); + vm->add_host( 4 ); + vm->add_host( 2 ); + vm->add_host( 1 ); + + rc = vm->get_host(hid, hpool); + + CPPUNIT_ASSERT( rc == 0 ); + CPPUNIT_ASSERT( hid == 4 ); + + // If we set host 5 to have the greatest priority, get_host should + // return it. + + priorities.push_back(1.0); // hid 5 + priorities.push_back(0.8); // hid 4 + priorities.push_back(0.5); // hid 2 + priorities.push_back(0.3); // hid 1 + + vm->set_priorities(priorities); + + rc = vm->get_host(hid, hpool); + + CPPUNIT_ASSERT( rc == 0 ); + CPPUNIT_ASSERT( hid == 5 ); + + delete hpool; }; @@ -216,11 +312,18 @@ public: int main(int argc, char ** argv) { + // We need to set the log file + NebulaLog::init_log_system(NebulaLog::FILE, Log::DEBUG, "test.log"); + NebulaLog::log("Test", Log::INFO, "Test started"); + CppUnit::TextUi::TestRunner runner; runner.addTest(VirtualMachineXMLTest::suite()); runner.run(); + remove("test.log"); + NebulaLog::finalize_log_system(); + return 0; } @@ -229,282 +332,188 @@ int main(int argc, char ** argv) const string FriendVirtualMachinePool::xmls[] = { -"\ - 0\ - 123\ - VM name\ - 0\ - 1\ - 0\ - 0000000000\ - 0\ - \ - 0\ - 0\ - 0\ - 0\ - \ -", +" 0 0 vm-example 0 1 0 1274087556 1274087589 0 0 0 0 0 host16 15 1274087589 1274087589 1274087589 1274087589 0 0 0 0 1 ", -"\ - 1\ - 123\ - VM name\ - 0\ - 1\ - 0\ - 0000000000\ - 0\ - \ - 0\ - 0\ - 0\ - 0\ - \ -", +" 1 0 vm-example 0 1 0 1274087557 1274087590 0 0 0 0 0 host16 15 1274087589 1274087589 1274087589 1274087589 0 0 0 0 1 ", -"\ - 2\ - 123\ - VM name\ - 0\ - 1\ - 0\ - 0000000000\ - 0\ - \ - 0\ - 0\ - 0\ - 0\ - \ -" - -/* - "0123VM one010000000000000000", - - "1261Second VM0" - "1000000000000<" - "/ETIME>0000", - - "2123VM one010000000000000000" -*/ +" 2 0 vm-example 0 1 0 1274087557 1274087590 0 0 0 0 0 host16 15 1274087589 1274087590 1274087589 1274087590 0 0 0 0 1 " }; const string FriendVirtualMachinePool::vm_dump = -"" -" " -" 0" -" 0" -" one_user_test" -" VM one" -" 0" -" 1" -" 0" -" 0000000000" -" 0" -" " -" 0" -" 0" -" 0" -" 0" -" " -" " -" 1" -" 0" -" one_user_test" -" Second VM" -" 0" -" 1" -" 0" -" 0000000000" -" 0" -" " -" 0" -" 0" -" 0" -" 0" -" " -" 0" -" A_hostname" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" " -" " -" " -" 2" -" 0" -" one_user_test" -" VM one" -" 0" -" 1" -" 0" -" 0000000000" -" 0" -" " -" 0" -" 0" -" 0" -" 0" -" " -" 1" -" C_hostname" -" 2" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" " -" " -" " -" 3" -" 0" -" one_user_test" -" VM three" -" 0" -" 2" -" 0" -" 0000000000" -" 0" -" " -" 0" -" 0" -" 0" -" 0" -" " -" 1" -" C_hostname" -" 2" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" 0" -" " -" " -""; +" 0 0 carlos vm-example 0 1 0 1274087556 1274087589 0 0 0 0 0 host16 15 1274087589 1274087589 1274087589 1274087589 0 0 0 0 1 1 0 carlos vm-example 0 1 0 1274087557 1274087590 0 0 0 0 0 host16 15 1274087589 1274087589 1274087589 1274087589 0 0 0 0 1 2 0 carlos vm-example 0 1 0 1274087557 1274087590 0 0 0 0 0 host16 15 1274087589 1274087590 1274087589 1274087590 0 0 0 0 1 3 0 carlos vm-example 0 7 0 1274087557 1274087590 0 0 0 0 0 host16 15 1274087589 1274087590 1274087589 1274087590 0 0 0 0 1 4 0 carlos vm-example 0 7 0 1274087558 1274087590 0 0 0 0 0 host16 15 1274087590 1274087590 1274087590 1274087590 0 0 0 0 1 5 0 carlos vm-example 0 7 0 1274087558 1274087590 0 0 0 0 0 host16 15 1274087590 1274087590 1274087590 1274087590 0 0 0 0 1 6 0 carlos vm-example 0 7 0 1274087559 1274087591 0 0 0 0 0 host16 15 1274087590 1274087590 1274087590 1274087590 0 0 0 0 1 "; -const string VirtualMachineXMLTest::host_dump = -"" +const string FriendHostPool::xmls[] = +{ +"", -" " -" 9" -" host" -" 0" -" im_mad" -" vmm_mad" -" tm_mad" -" 0000000000" -" " -" 4" -" 256" -" 128" -" 20" -" 512" -" 512" -" 200" -" 256" -" 384" -" 180" -" 256" -" 128" -" 20" -" 0" -" " -" " +"\ + 1\ + ursa12\ + 2\ + im_kvm\ + vmm_kvm\ + tm_nfs\ + 1274107238\ + \ + 1\ + 0\ + 262144\ + 80\ + 0\ + 524288\ + 100\ + 0\ + 0\ + 0\ + 0\ + 536220\ + 0\ + 0\ + \ + \ +", -" " -" 13" -" host" -" 0" -" im_mad" -" vmm_mad" -" tm_mad" -" 0000000000" -" " -" 4" -" 256" -" 128" -" 20" -" 512" -" 512" -" 200" -" 256" -" 384" -" 180" -" 256" -" 128" -" 20" -" 0" -" " -" " +"\ + 2\ + ursa\ + 2\ + im_kvm\ + vmm_kvm\ + tm_nfs\ + 1274107299\ + \ + 2\ + 0\ + 458752\ + 20\ + 0\ + 524288\ + 100\ + 0\ + 9104256\ + 613\ + 0\ + 13897924\ + 186\ + 7\ + \ + \ +", + +"", + +"\ + 4\ + ursa11\ + 2\ + im_kvm\ + vmm_kvm\ + tm_nfs\ + 1274107328\ + \ + 4\ + 0\ + 262144\ + 10\ + 0\ + 524288\ + 100\ + 0\ + 7958684\ + 800\ + 0\ + 621616\ + 0\ + 0\ + \ + \ +", + +"\ + 5\ + ursa10\ + 2\ + im_kvm\ + vmm_kvm\ + tm_nfs\ + 1274107300\ + \ + 5\ + 256\ + 0\ + 30\ + 512\ + 524288\ + 100\ + 256\ + 384\ + 180\ + 0\ + 2191756\ + 6\ + 0\ + \ + \ +" +}; + +const string FriendHostPool::host_dump = +" 1 ursa12 2 im_kvm vmm_kvm tm_nfs 1274107145 1 0 0 0 0 8194368 800 0 7955180 800 0 535848 0 0 2 ursa 2 im_kvm vmm_kvm tm_nfs 1274107206 2 0 4280320 700 0 16468252 800 0 9109156 628 0 13891232 172 7 4 ursa11 2 im_kvm vmm_kvm tm_nfs 1274107145 4 0 0 0 0 8194368 800 0 7958684 800 0 621616 0 0 5 ursa10 2 im_kvm vmm_kvm tm_nfs 1274107207 5 0 0 0 0 8194368 800 0 7870776 796 0 2192424 4 0 6 ursa08 3 im_kvm vmm_kvm tm_nfs 1274107176 6 0 0 0 0 0 0 0 6585200 0 0 1132608 0 0 7 ursa09 3 im_kvm vmm_kvm tm_nfs 1274107146 7 0 524288 100 0 8194368 800 0 7286128 798 0 8011908 1 1 "; -" " -" 4" -" host" -" 0" -" im_mad" -" vmm_mad" -" tm_mad" -" 0000000000" -" " -" 4" -" 256" -" 128" -" 20" -" 512" -" 512" -" 200" -" 256" -" 384" -" 180" -" 256" -" 128" -" 20" -" 0" -" " -" " -"";