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

feature #476. Fixes tests after merge. hook_location is now inititlized

Browse Source
This commit is contained in:
Ruben S. Montero 2011-06-23 17:28:29 +02:00
parent 2249929171
commit a991817a3a
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nebula/Nebula.cc
View File

@ -44,7 +44,6 @@ void Nebula::start()
int signal;
char hn[80];
string scripts_remote_dir;
string hook_location;
if ( gethostname(hn,79) != 0 )
{

2
src/test/Nebula.cc
View File

@ -148,7 +148,7 @@ void Nebula::start()
etc_location = nebula_location + "etc/";
log_location = nebula_location + "var/";
var_location = nebula_location + "var/";
hook_location = nebula_location + "share/hooks/";
hook_location = nebula_location + "hooks/";
remotes_location = nebula_location + "var/remotes/";
if ( nebula_configuration != 0)

2
src/vnm/VirtualNetwork.cc
View File

@ -522,7 +522,7 @@ string& VirtualNetwork::to_xml_extended(string& xml, bool extended) const
os << "<PHYDEV>" << phydev << "</PHYDEV>";
}
os << "<PUBLIC>" << public_vnet << "</PUBLIC>" <<
os << "<PUBLIC>" << public_obj << "</PUBLIC>" <<
"<TOTAL_LEASES>"<< total_leases << "</TOTAL_LEASES>"<<
obj_template->to_xml(template_xml);

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

@ -274,37 +274,31 @@ public:
};
string phydev_xml[] = {
"<VNET><ID>0</ID><UID>0</UID><USERNAME>oneadmin</USERNAME><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><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>1</ID><UID>0</UID><USERNAME>oneadmin</USERNAME><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>"
"<VNET><ID>1</ID><UID>0</UID><GID>0</GID><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
rc = vnpool->allocate(0,"oneadmin",phydev_templates[0], &oid);
rc = vnpool->allocate(0,phydev_templates[0], &oid);
CPPUNIT_ASSERT( rc >= 0 );
vn = vnpool->get(rc, false);
CPPUNIT_ASSERT( vn != 0 );
((VirtualNetwork*)vn)->to_xml(xml_str);
oss << * ((VirtualNetwork*)vn);
xml_str = oss.str();
((VirtualNetwork*)vn)->to_xml_extended(xml_str);
CPPUNIT_ASSERT( xml_str == phydev_xml[0] );
// test vm with phydev only
oss.str("");
rc = vnpool->allocate(0,"oneadmin",phydev_templates[1], &oid);
rc = vnpool->allocate(0,phydev_templates[1], &oid);
CPPUNIT_ASSERT( rc >= 0 );
vn = vnpool->get(rc, false);
CPPUNIT_ASSERT( vn != 0 );
((VirtualNetwork*)vn)->to_xml(xml_str);
oss << * ((VirtualNetwork*)vn);
xml_str = oss.str();
((VirtualNetwork*)vn)->to_xml_extended(xml_str);
CPPUNIT_ASSERT( xml_str == phydev_xml[1] );
}