From a991817a3a2e843d3324bd50050a849e028611cd Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rubensm@dacya.ucm.es>
Date: Thu, 23 Jun 2011 17:28:29 +0200
Subject: [PATCH] feature #476. Fixes tests after merge. hook_location is now
 inititlized

---
 src/nebula/Nebula.cc                   |  1 -
 src/test/Nebula.cc                     |  2 +-
 src/vnm/VirtualNetwork.cc              |  2 +-
 src/vnm/test/VirtualNetworkPoolTest.cc | 18 ++++++------------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index 61dc01330e..3879d2ee71 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -44,7 +44,6 @@ void Nebula::start()
     int             signal;
     char            hn[80];
     string          scripts_remote_dir;
-    string          hook_location;
 
     if ( gethostname(hn,79) != 0 )
     {
diff --git a/src/test/Nebula.cc b/src/test/Nebula.cc
index 4fb6df495c..c909dc21ba 100644
--- a/src/test/Nebula.cc
+++ b/src/test/Nebula.cc
@@ -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)
diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc
index 048b7970d2..bb669dd6aa 100644
--- a/src/vnm/VirtualNetwork.cc
+++ b/src/vnm/VirtualNetwork.cc
@@ -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);
 
diff --git a/src/vnm/test/VirtualNetworkPoolTest.cc b/src/vnm/test/VirtualNetworkPoolTest.cc
index 40fbb142f2..05e7227242 100644
--- a/src/vnm/test/VirtualNetworkPoolTest.cc
+++ b/src/vnm/test/VirtualNetworkPoolTest.cc
@@ -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] );
     }