shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-22 17:57:46 +03:00
Code Releases Wiki Activity

bug #274: Updated tests

Browse Source
This commit is contained in:
Ruben S. Montero 2010-08-06 00:23:57 +02:00
parent b4c0fa6046
commit 3347c51489
8 changed files with 68 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/host/test/HostPoolTest.cc
View File

@ -169,9 +169,10 @@ protected:
int allocate(int index)
{
int oid;
int oid;
string err;
return ((HostPool*)pool)->allocate(&oid, names[index], im_mad,
vmm_mad, tm_mad);
vmm_mad, tm_mad, err);
};
void check(int index, PoolObjectSQL* obj)
@ -235,22 +236,23 @@ public:
int rc, oid_0, oid_1;
HostPool * hp = static_cast<HostPool *>(pool);
Host * host;
string err;
string tm_mad_2 = "another_tm_mad";
// If we try to allocate two hosts with the same name and drivers,
// should fail
rc = hp->allocate(&oid_0, names[0], im_mad, vmm_mad, tm_mad);
rc = hp->allocate(&oid_0, names[0], im_mad, vmm_mad, tm_mad, err);
CPPUNIT_ASSERT( oid_0 == 0 );
CPPUNIT_ASSERT( rc == oid_0 );
rc = hp->allocate(&oid_1, names[0], im_mad, vmm_mad, tm_mad);
rc = hp->allocate(&oid_1, names[0], im_mad, vmm_mad, tm_mad, err);
CPPUNIT_ASSERT( oid_1 == -1 );
CPPUNIT_ASSERT( rc == oid_1 );
// But if the drivers change, the hostname can be repeated
rc = hp->allocate(&oid_1, names[0], im_mad, vmm_mad, tm_mad_2);
rc = hp->allocate(&oid_1, names[0], im_mad, vmm_mad, tm_mad_2, err);
CPPUNIT_ASSERT( oid_1 == 1 );
CPPUNIT_ASSERT( rc == oid_1 );
@ -270,10 +272,12 @@ public:
{
string names[] = {"a", "a name", "a_name", "another name", "host"};
int rc, oid;
string err;
for(int i=0; i<5; i++)
{
((HostPool*)pool)->allocate(&oid, names[i], im_mad, vmm_mad, tm_mad);
((HostPool*)pool)->allocate(&oid, names[i],
im_mad, vmm_mad, tm_mad, err);
}
ostringstream oss;
@ -292,10 +296,12 @@ public:
{
string names[] = {"a", "a name", "a_name", "another name", "host"};
int rc, oid;
string err;
for(int i=0; i<5; i++)
{
((HostPool*)pool)->allocate(&oid, names[i], im_mad, vmm_mad, tm_mad);
((HostPool*)pool)->allocate(&oid, names[i],
im_mad, vmm_mad, tm_mad, err);
}
@ -321,12 +327,13 @@ public:
Host * host;
HostPool * hp = static_cast<HostPool *>(pool);
ostringstream oss;
string err;
for(i=0, oss.str(""); i<20; i++,oss.str(""))
{
oss << "host" << i;
hp->allocate(&oid, oss.str().c_str(), im_mad, vmm_mad, tm_mad);
hp->allocate(&oid, oss.str().c_str(), im_mad, vmm_mad, tm_mad, err);
CPPUNIT_ASSERT(oid == i);
if (i >=8 )
@ -371,8 +378,9 @@ public:
{
HostPool * hp = static_cast<HostPool *>(pool);
int clid, rc;
string err;
rc = hp->allocate_cluster(&clid, "new_cluster");
rc = hp->allocate_cluster(&clid, "new_cluster", err);
CPPUNIT_ASSERT( rc == clid );
CPPUNIT_ASSERT( clid == 1 );
@ -380,7 +388,7 @@ public:
"<CLUSTER><ID>1</ID><NAME>new_cluster</NAME></CLUSTER>");
// Try to allocate using the same name
rc = hp->allocate_cluster(&clid, "new_cluster");
rc = hp->allocate_cluster(&clid, "new_cluster", err);
CPPUNIT_ASSERT( rc == clid );
CPPUNIT_ASSERT( clid == -1 );
}
@ -391,13 +399,14 @@ public:
{
HostPool * hp = static_cast<HostPool *>(pool);
int clid, rc;
string err;
// Drop a non-existing cluster
rc = hp->drop_cluster(20);
CPPUNIT_ASSERT( rc == -1 );
// Allocate a cluster and drop it
rc = hp->allocate_cluster(&clid, "new_cluster");
rc = hp->allocate_cluster(&clid, "new_cluster", err);
CPPUNIT_ASSERT( clid == 1);
rc = hp->drop_cluster(clid);
@ -415,18 +424,19 @@ public:
HostPool * hp = static_cast<HostPool *>(pool);
int clid, rc;
ostringstream oss;
string err;
// Allocate some clusters
rc = hp->allocate_cluster(&clid, "cluster_a");
rc = hp->allocate_cluster(&clid, "cluster_a", err);
CPPUNIT_ASSERT( rc == 1 );
rc = hp->allocate_cluster(&clid, "cluster_b");
rc = hp->allocate_cluster(&clid, "cluster_b", err);
CPPUNIT_ASSERT( rc == 2 );
rc = hp->allocate_cluster(&clid, "cluster_c");
rc = hp->allocate_cluster(&clid, "cluster_c", err);
CPPUNIT_ASSERT( rc == 3 );
rc = hp->allocate_cluster(&clid, "cluster_d");
rc = hp->allocate_cluster(&clid, "cluster_d", err);
CPPUNIT_ASSERT( rc == 4 );
// Drop id 2
@ -434,7 +444,7 @@ public:
CPPUNIT_ASSERT( rc == 0 );
// Next one should use id 5, because the biggest id is 4
rc = hp->allocate_cluster(&clid, "cluster_e");
rc = hp->allocate_cluster(&clid, "cluster_e", err);
CPPUNIT_ASSERT( rc == 5 );
// Drop id 5
@ -442,7 +452,7 @@ public:
CPPUNIT_ASSERT( rc == 0 );
// Next one should use id 5, because the biggest id is 4 again
rc = hp->allocate_cluster(&clid, "cluster_f");
rc = hp->allocate_cluster(&clid, "cluster_f", err);
CPPUNIT_ASSERT( rc == 5 );
}
@ -454,18 +464,19 @@ public:
HostPool * hp = static_cast<HostPool *>(pool);
int clid, rc;
ostringstream oss;
string err;
// Allocate some clusters
rc = hp->allocate_cluster(&clid, "cluster_a");
rc = hp->allocate_cluster(&clid, "cluster_a", err);
CPPUNIT_ASSERT( rc == 1 );
rc = hp->allocate_cluster(&clid, "cluster_b");
rc = hp->allocate_cluster(&clid, "cluster_b", err);
CPPUNIT_ASSERT( rc == 2 );
rc = hp->allocate_cluster(&clid, "cluster_c");
rc = hp->allocate_cluster(&clid, "cluster_c", err);
CPPUNIT_ASSERT( rc == 3 );
rc = hp->allocate_cluster(&clid, "cluster_d");
rc = hp->allocate_cluster(&clid, "cluster_d", err);
CPPUNIT_ASSERT( rc == 4 );
@ -485,7 +496,7 @@ public:
HostPool * hp = static_cast<HostPool *>(pool);
Host* host;
int clid, rc, oid;
string xml_str;
string xml_str, err;
// Allocate a host
oid = allocate(0);
@ -494,7 +505,7 @@ public:
host = hp->get(0, false);
CPPUNIT_ASSERT(host != 0);
rc = hp->allocate_cluster(&clid, "cluster_a");
rc = hp->allocate_cluster(&clid, "cluster_a", err);
CPPUNIT_ASSERT( rc == 1 );
rc = hp->set_cluster(host, clid);
@ -519,7 +530,7 @@ public:
HostPool * hp = static_cast<HostPool *>(pool);
Host* host;
int clid, rc, oid;
string xml_str;
string xml_str, err;
// Allocate a host
oid = allocate(0);
@ -528,7 +539,7 @@ public:
host = hp->get(0, false);
CPPUNIT_ASSERT(host != 0);
rc = hp->allocate_cluster(&clid, "cluster_a");
rc = hp->allocate_cluster(&clid, "cluster_a", err);
CPPUNIT_ASSERT( rc == 1 );
// Set host 0 to cluster 1

8
src/image/test/ImagePoolTest.cc
View File

@ -84,13 +84,14 @@ public:
ImageTemplate * img_template;
char * error_msg = 0;
int rc;
string err;
img_template = new ImageTemplate;
rc = img_template->parse(stemplate,&error_msg);
if( rc == 0 )
{
return ImagePool::allocate(uid, img_template, oid);
return ImagePool::allocate(uid, img_template, oid, err);
}
else
{
@ -174,6 +175,7 @@ protected:
// So the ONE_AUTH environment is forced to point to a test one_auth
// file.
ostringstream oss;
string err;
oss << getenv("PWD") << "/one_auth";
setenv("ONE_AUTH", oss.str().c_str(), 1);
@ -188,8 +190,8 @@ protected:
string pass_1 = "A pass";
string pass_2 = "B pass";
user_pool->allocate(&uid_1, username_1, pass_1, true);
user_pool->allocate(&uid_2, username_2, pass_2, true);
user_pool->allocate(&uid_1, username_1, pass_1, true, err);
user_pool->allocate(&uid_2, username_2, pass_2, true, err);
delete user_pool;
};

2
src/pool/test/TestPoolSQL.cc
View File

@ -85,7 +85,7 @@ int TestObjectSQL::select(SqlDB *db)
/* -------------------------------------------------------------------------- */
int TestObjectSQL::insert(SqlDB *db)
int TestObjectSQL::insert(SqlDB *db, string& str)
{
ostringstream oss;

2
src/pool/test/TestPoolSQL.h
View File

@ -43,7 +43,7 @@ public:
int select(SqlDB *db);
int insert(SqlDB *db);
int insert(SqlDB *db, string& err);
int update(SqlDB *db);

3
src/pool/test/pool.cc
View File

@ -53,9 +53,10 @@ private:
int create_allocate(int n, string st)
{
string err;
TestObjectSQL *obj = new TestObjectSQL(n,st);
return pool->allocate(obj);
return pool->allocate(obj, err);
};
public:

19
src/um/test/UserPoolTest.cc
View File

@ -90,8 +90,10 @@ protected:
int allocate(int index)
{
int oid;
string err;
return ((UserPool*)pool)->allocate(&oid, usernames[index],
passwords[index], true);
passwords[index], true, err);
};
void check(int index, PoolObjectSQL* obj)
@ -260,20 +262,21 @@ public:
void duplicates()
{
int rc, oid;
string err;
UserPool * up = static_cast<UserPool *>(pool);
// Allocate a user.
rc = up->allocate(&oid, usernames[0], passwords[0], true);
rc = up->allocate(&oid, usernames[0], passwords[0], true, err);
CPPUNIT_ASSERT( oid == 1 );
CPPUNIT_ASSERT( oid == rc );
// Try to allocate twice the same user, should fail
rc = up->allocate(&oid, usernames[0], passwords[0], true);
rc = up->allocate(&oid, usernames[0], passwords[0], true, err);
CPPUNIT_ASSERT( rc == -1 );
CPPUNIT_ASSERT( oid == rc );
// Try again, with different password
rc = up->allocate(&oid, usernames[0], passwords[1], true);
rc = up->allocate(&oid, usernames[0], passwords[1], true, err);
CPPUNIT_ASSERT( rc == -1 );
CPPUNIT_ASSERT( oid == rc );
}
@ -284,10 +287,11 @@ public:
string d_pass[] = {"p", "pass", "password", "secret", "1234"};
int oid;
string err;
for(int i=0; i<5; i++)
{
((UserPool*)pool)->allocate(&oid, d_names[i], d_pass[i], true);
((UserPool*)pool)->allocate(&oid, d_names[i], d_pass[i], true, err);
}
ostringstream oss;
@ -302,10 +306,11 @@ public:
string d_pass[] = {"p", "pass", "password", "secret", "1234"};
int oid;
string err;
for(int i=0; i<5; i++)
{
((UserPool*)pool)->allocate(&oid, d_names[i], d_pass[i], true);
((UserPool*)pool)->allocate(&oid, d_names[i], d_pass[i], true, err);
}
// Note: second parameter of dump is the WHERE constraint. The "order

9
src/vm/test/VirtualMachinePoolTest.cc
View File

@ -101,13 +101,15 @@ public:
VirtualMachineTemplate * vm_template;
char * error_msg = 0;
int rc;
string err;
vm_template = new VirtualMachineTemplate;
rc = vm_template->parse(stemplate,&error_msg);
if( rc == 0 )
{
return VirtualMachinePool::allocate(uid, vm_template, oid, on_hold);
return VirtualMachinePool::allocate(uid, vm_template, oid,
err, on_hold);
}
else
{
@ -182,6 +184,7 @@ protected:
// So the ONE_AUTH environment is forced to point to a test one_auth
// file.
ostringstream oss;
string err;
oss << getenv("PWD") << "/one_auth";
setenv("ONE_AUTH", oss.str().c_str(), 1);
@ -196,8 +199,8 @@ protected:
string pass_1 = "A pass";
string pass_2 = "B pass";
user_pool->allocate(&uid_1, username_1, pass_1, true);
user_pool->allocate(&uid_2, username_2, pass_2, true);
user_pool->allocate(&uid_1, username_1, pass_1, true, err);
user_pool->allocate(&uid_2, username_2, pass_2, true, err);
delete user_pool;
};

8
src/vnm/test/VirtualNetworkPoolTest.cc
View File

@ -102,13 +102,14 @@ public:
VirtualNetworkTemplate * vn_template;
char * error_msg = 0;
int rc;
string err;
vn_template = new VirtualNetworkTemplate;
rc = vn_template->parse(stemplate,&error_msg);
if( rc == 0 )
{
return VirtualNetworkPool::allocate(uid, vn_template, oid);
return VirtualNetworkPool::allocate(uid, vn_template, oid, err);
}
else
{
@ -185,6 +186,7 @@ protected:
// So the ONE_AUTH environment is forced to point to a test one_auth
// file.
ostringstream oss;
string err;
oss << getenv("PWD") << "/one_auth";
setenv("ONE_AUTH", oss.str().c_str(), 1);
@ -199,8 +201,8 @@ protected:
string pass_1 = "A pass";
string pass_2 = "B pass";
user_pool->allocate(&uid_1, username_1, pass_1, true);
user_pool->allocate(&uid_2, username_2, pass_2, true);
user_pool->allocate(&uid_1, username_1, pass_1, true, err);
user_pool->allocate(&uid_2, username_2, pass_2, true, err);
delete user_pool;
};