shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-25 06:03:36 +03:00
Code Releases Wiki Activity

bug #847 - #913: Fixes Network tests and some core bugs

Browse Source
This commit is contained in:
Ruben S. Montero 2011-10-14 17:15:20 +02:00
parent 5407e58967
commit e2f2c25ee3
4 changed files with 74 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/Nebula.cc
View File

@ -194,8 +194,8 @@ void Nebula::start()
try try
{ {
string mac_prefix = "00:00"; string mac_prefix = "00:02";
int size = 1; int size = 126;
string default_image_type = "OS"; string default_image_type = "OS";
string default_device_prefix = "hd"; string default_device_prefix = "hd";

4
src/vnm/VirtualNetwork.cc
View File

@ -294,14 +294,14 @@ int VirtualNetwork::insert(SqlDB * db, string& error_str)
int size = 0; int size = 0;
// retrieve specific information from template // retrieve specific information from template
erase_template_attribute("NETWORK_ADDRESS",naddr); get_template_attribute("NETWORK_ADDRESS",naddr);
if (naddr.empty()) if (naddr.empty())
{ {
goto error_addr; goto error_addr;
} }
erase_template_attribute("NETWORK_SIZE",nclass); get_template_attribute("NETWORK_SIZE",nclass);
if ( nclass == "B" || nclass == "b" ) if ( nclass == "B" || nclass == "b" )
{ {

25
src/vnm/test/SConstruct
View File

@ -17,19 +17,30 @@
Import('env') Import('env')
env.Prepend(LIBS=[ env.Prepend(LIBS=[
'nebula_log', 'nebula_core_test',
'nebula_host',
'nebula_xml',
'nebula_vmm',
'nebula_im',
'nebula_rm',
'nebula_tm',
'nebula_um', 'nebula_um',
'nebula_mad',
'nebula_template',
'nebula_vm',
'nebula_vmtemplate',
'nebula_group',
'nebula_vnm', 'nebula_vnm',
'nebula_image',
'nebula_pool',
'nebula_hm',
'nebula_authm', 'nebula_authm',
'nebula_acl', 'nebula_acl',
'nebula_group',
'nebula_template',
'nebula_pool',
'nebula_xml',
'nebula_mad',
'nebula_core',
'nebula_common', 'nebula_common',
'nebula_lcm',
'nebula_dm',
'nebula_sql', 'nebula_sql',
'nebula_log',
'crypto' 'crypto'
]) ])

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

@ -71,18 +71,33 @@ const string templates[] =
const string xmls[] = const string xmls[] =
{ {
"<VNET><ID>0</ID><UID>123</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>Net number one</NAME><TYPE>1</TYPE><BRIDGE>br1</BRIDGE><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[br1]]></BRIDGE><LEASES><IP><![CDATA[130.10.0.1]]></IP><MAC><![CDATA[50:20:20:20:20:20]]></MAC></LEASES><NAME><![CDATA[Net number one]]></NAME><TYPE><![CDATA[FIXED]]></TYPE></TEMPLATE><LEASES><LEASE><IP>130.10.0.1</IP><MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>", "<VNET><ID>0</ID><UID>123</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>Net number one</NAME><TYPE>1</TYPE><BRIDGE>br1</BRIDGE><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE></TEMPLATE><LEASES><LEASE><IP>130.10.0.1</IP><MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>",
"<VNET><ID>1</ID><UID>261</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>A virtual network</NAME><TYPE>0</TYPE><BRIDGE>br0</BRIDGE><PUBLIC>1</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[br0]]></BRIDGE><NAME><![CDATA[A virtual network]]></NAME><NETWORK_ADDRESS><![CDATA[192.168.0.0]]></NETWORK_ADDRESS><NETWORK_SIZE><![CDATA[C]]></NETWORK_SIZE><TYPE><![CDATA[RANGED]]></TYPE></TEMPLATE><LEASES></LEASES></VNET>", "<VNET><ID>1</ID><UID>261</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>A virtual network</NAME><TYPE>0</TYPE><BRIDGE>br0</BRIDGE><PUBLIC>1</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><NETWORK_ADDRESS><![CDATA[192.168.0.0]]></NETWORK_ADDRESS><NETWORK_SIZE><![CDATA[C]]></NETWORK_SIZE></TEMPLATE><LEASES></LEASES></VNET>",
"<VNET><ID>0</ID><UID>133</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>Net number two</NAME><TYPE>1</TYPE><BRIDGE>br1</BRIDGE><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[br1]]></BRIDGE><LEASES><IP><![CDATA[130.10.2.1]]></IP><MAC><![CDATA[50:20:20:20:20:20]]></MAC></LEASES><NAME><![CDATA[Net number two]]></NAME><TYPE><![CDATA[fixed]]></TYPE></TEMPLATE><LEASES><LEASE><IP>130.10.2.1</IP><MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>" "<VNET><ID>0</ID><UID>133</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>Net number two</NAME><TYPE>1</TYPE><BRIDGE>br1</BRIDGE><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE></TEMPLATE><LEASES><LEASE><IP>130.10.2.1</IP><MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>",
}; };
const string xml_dump = const string xml_dump =
"<VNET_POOL><VNET><ID>0</ID><UID>1</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>Net number one</NAME><TYPE>1</TYPE><BRIDGE>br1</BRIDGE><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[br1]]></BRIDGE><LEASES><IP><![CDATA[130.10.0.1]]></IP><MAC><![CDATA[50:20:20:20:20:20]]></MAC></LEASES><NAME><![CDATA[Net number one]]></NAME><TYPE><![CDATA[FIXED]]></TYPE></TEMPLATE></VNET><VNET><ID>1</ID><UID>2</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>A virtual network</NAME><TYPE>0</TYPE><BRIDGE>br0</BRIDGE><PUBLIC>1</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[br0]]></BRIDGE><NAME><![CDATA[A virtual network]]></NAME><NETWORK_ADDRESS><![CDATA[192.168.0.0]]></NETWORK_ADDRESS><NETWORK_SIZE><![CDATA[C]]></NETWORK_SIZE><TYPE><![CDATA[RANGED]]></TYPE></TEMPLATE></VNET></VNET_POOL>"; "<VNET_POOL><VNET><ID>0</ID><UID>1</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>Net number one</NAME><TYPE>1</TYPE><BRIDGE>br1</BRIDGE><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE></TEMPLATE></VNET><VNET><ID>1</ID><UID>2</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>A virtual network</NAME><TYPE>0</TYPE><BRIDGE>br0</BRIDGE><PUBLIC>1</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><NETWORK_ADDRESS><![CDATA[192.168.0.0]]></NETWORK_ADDRESS><NETWORK_SIZE><![CDATA[C]]></NETWORK_SIZE></TEMPLATE></VNET></VNET_POOL>";
const string xml_dump_where = const string xml_dump_where =
"<VNET_POOL><VNET><ID>1</ID><UID>2</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>A virtual network</NAME><TYPE>0</TYPE><BRIDGE>br0</BRIDGE><PUBLIC>1</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[br0]]></BRIDGE><NAME><![CDATA[A virtual network]]></NAME><NETWORK_ADDRESS><![CDATA[192.168.0.0]]></NETWORK_ADDRESS><NETWORK_SIZE><![CDATA[C]]></NETWORK_SIZE><TYPE><![CDATA[RANGED]]></TYPE></TEMPLATE></VNET></VNET_POOL>"; "<VNET_POOL><VNET><ID>1</ID><UID>2</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>A virtual network</NAME><TYPE>0</TYPE><BRIDGE>br0</BRIDGE><PUBLIC>1</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><NETWORK_ADDRESS><![CDATA[192.168.0.0]]></NETWORK_ADDRESS><NETWORK_SIZE><![CDATA[C]]></NETWORK_SIZE></TEMPLATE></VNET></VNET_POOL>";
/* ************************************************************************* */
/* ************************************************************************* */
#include "NebulaTest.h"
class NebulaTestVNet: public NebulaTest
{
public:
NebulaTestVNet():NebulaTest()
{
NebulaTest::the_tester = this;
need_vnet_pool = true;
};
};
/* ************************************************************************* */ /* ************************************************************************* */
/* ************************************************************************* */ /* ************************************************************************* */
@ -168,19 +183,19 @@ class VirtualNetworkPoolTest : public PoolTest
CPPUNIT_TEST_SUITE_END (); CPPUNIT_TEST_SUITE_END ();
protected: protected:
NebulaTestVNet *tester;
VirtualNetworkPool *vnpool;
void bootstrap(SqlDB* db) void bootstrap(SqlDB* db)
{ {
VirtualNetworkPool::bootstrap(db);
}; };
PoolSQL* create_pool(SqlDB* db) PoolSQL* create_pool(SqlDB* db)
{ {
// VNet pool constructor needs DB, default mac prefix, return vnpool;
// and default network size
return new VirtualNetworkPool(db, "00:01", 126);
}; };
int allocate(int index) int allocate(int index)
{ {
int oid; int oid;
@ -214,6 +229,28 @@ public:
~VirtualNetworkPoolTest(){xmlCleanupParser();}; ~VirtualNetworkPoolTest(){xmlCleanupParser();};
void setUp()
{
create_db();
tester = new NebulaTestVNet();
Nebula& neb = Nebula::instance();
neb.start();
vnpool = neb.get_vnpool();
pool = vnpool;
};
void tearDown()
{
// -----------------------------------------------------------
delete_db();
delete tester;
};
/* ********************************************************************* */ /* ********************************************************************* */
/* ********************************************************************* */ /* ********************************************************************* */
@ -273,9 +310,8 @@ public:
}; };
string phydev_xml[] = { string phydev_xml[] = {
"<VNET><ID>0</ID><UID>0</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>BRIDGE and PHYDEV</NAME><TYPE>1</TYPE><BRIDGE>br0</BRIDGE><PHYDEV>eth0</PHYDEV><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[br0]]></BRIDGE><LEASES><IP><![CDATA[130.10.0.1]]></IP><MAC><![CDATA[50:20:20:20:20:20]]></MAC></LEASES><NAME><![CDATA[BRIDGE and PHYDEV]]></NAME><PHYDEV><![CDATA[eth0]]></PHYDEV><TYPE><![CDATA[FIXED]]></TYPE></TEMPLATE><LEASES><LEASE><IP>130.10.0.1</IP><MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>", "<VNET><ID>0</ID><UID>0</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>BRIDGE and PHYDEV</NAME><TYPE>1</TYPE><BRIDGE>br0</BRIDGE><PHYDEV>eth0</PHYDEV><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE></TEMPLATE><LEASES><LEASE><IP>130.10.0.1</IP><MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>",
"<VNET><ID>1</ID><UID>0</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>No BRIDGE only PHYDEV</NAME><TYPE>1</TYPE><BRIDGE>onebr1</BRIDGE><PHYDEV>eth0</PHYDEV><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[onebr1]]></BRIDGE></TEMPLATE><LEASES><LEASE><IP>130.10.0.1</IP><MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>"
"<VNET><ID>1</ID><UID>0</UID><GID>0</GID><UNAME>the_user</UNAME><GNAME>oneadmin</GNAME><NAME>No BRIDGE only PHYDEV</NAME><TYPE>1</TYPE><BRIDGE>onebr1</BRIDGE><PHYDEV>eth0</PHYDEV><PUBLIC>0</PUBLIC><TOTAL_LEASES>0</TOTAL_LEASES><TEMPLATE><BRIDGE><![CDATA[onebr1]]></BRIDGE><LEASES><IP><![CDATA[130.10.0.1]]></IP><MAC><![CDATA[50:20:20:20:20:20]]></MAC></LEASES><NAME><![CDATA[No BRIDGE only PHYDEV]]></NAME><PHYDEV><![CDATA[eth0]]></PHYDEV><TYPE><![CDATA[FIXED]]></TYPE></TEMPLATE><LEASES><LEASE><IP>130.10.0.1</IP><MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>"
}; };
// test vm with bridge and phydev // test vm with bridge and phydev
@ -286,6 +322,7 @@ public:
CPPUNIT_ASSERT( vn != 0 ); CPPUNIT_ASSERT( vn != 0 );
((VirtualNetwork*)vn)->to_xml_extended(xml_str); ((VirtualNetwork*)vn)->to_xml_extended(xml_str);
CPPUNIT_ASSERT( xml_str == phydev_xml[0] ); CPPUNIT_ASSERT( xml_str == phydev_xml[0] );
// test vm with phydev only // test vm with phydev only
@ -640,7 +677,7 @@ public:
// Check that it is valid IP // Check that it is valid IP
CPPUNIT_ASSERT( rc == 0 ); CPPUNIT_ASSERT( rc == 0 );
CPPUNIT_ASSERT( ip == "192.168.50.1" ); CPPUNIT_ASSERT( ip == "192.168.50.1" );
CPPUNIT_ASSERT( mac == "00:01:c0:a8:32:01" ); CPPUNIT_ASSERT( mac == "00:02:c0:a8:32:01" );
CPPUNIT_ASSERT( bridge == "bridge0" ); CPPUNIT_ASSERT( bridge == "bridge0" );
// Clean the cache // Clean the cache
@ -697,7 +734,7 @@ public:
CPPUNIT_ASSERT( rc == 0 ); CPPUNIT_ASSERT( rc == 0 );
CPPUNIT_ASSERT( ip == "192.168.50.2" ); CPPUNIT_ASSERT( ip == "192.168.50.2" );
CPPUNIT_ASSERT( mac == "00:01:c0:a8:32:02" ); CPPUNIT_ASSERT( mac == "00:02:c0:a8:32:02" );
CPPUNIT_ASSERT( bridge == "bridge0" ); CPPUNIT_ASSERT( bridge == "bridge0" );
} }