diff --git a/src/image/test/ImagePoolTest.cc b/src/image/test/ImagePoolTest.cc index 04300e573a..51b07e7dfc 100644 --- a/src/image/test/ImagePoolTest.cc +++ b/src/image/test/ImagePoolTest.cc @@ -48,20 +48,20 @@ const string templates[] = const string xmls[] = { - "00Image one000000000000source_prefix/9ab4a4e021ee2883f57e3aeecc9e2aed7c3fa19840", + "00Image one000000000000source_prefix/9ab4a4e021ee2883f57e3aeecc9e2aed7c3fa19830", - "11Second Image010000000000source_prefix/c9d51800847467911c755e5e4c13dfe28c3a79f340", + "11Second Image010000000000source_prefix/c9d51800847467911c755e5e4c13dfe28c3a79f330", - "02The third image000000000000source_prefix/e50b0c738be9d431475bf5859629e5580301a7d640" + "02The third image000000000000source_prefix/e50b0c738be9d431475bf5859629e5580301a7d630" }; // This xml dump result has the STIMEs modified to 0000000000 const string xml_dump = -"00one_user_testImage one000000000000source_prefix/9ab4a4e021ee2883f57e3aeecc9e2aed7c3fa1984011A userSecond Image010000000000source_prefix/c9d51800847467911c755e5e4c13dfe28c3a79f34022B userThe third image000000000000source_prefix/e50b0c738be9d431475bf5859629e5580301a7d640"; +"00one_user_testImage one000000000000source_prefix/9ab4a4e021ee2883f57e3aeecc9e2aed7c3fa1983011A userSecond Image010000000000source_prefix/c9d51800847467911c755e5e4c13dfe28c3a79f33022B userThe third image000000000000source_prefix/e50b0c738be9d431475bf5859629e5580301a7d630"; const string xml_dump_where = -"00one_user_testImage one000000000000source_prefix/9ab4a4e021ee2883f57e3aeecc9e2aed7c3fa1984011A userSecond Image010000000000source_prefix/c9d51800847467911c755e5e4c13dfe28c3a79f340"; +"00one_user_testImage one000000000000source_prefix/9ab4a4e021ee2883f57e3aeecc9e2aed7c3fa1983011A userSecond Image010000000000source_prefix/c9d51800847467911c755e5e4c13dfe28c3a79f330"; const string replacement = "0000000000"; @@ -119,7 +119,6 @@ class ImagePoolTest : public PoolTest CPPUNIT_TEST ( target_generation ); CPPUNIT_TEST ( bus_source_assignment ); CPPUNIT_TEST ( public_attribute ); - CPPUNIT_TEST ( disk_overwrite ); CPPUNIT_TEST ( imagepool_disk_attribute ); CPPUNIT_TEST ( dump ); CPPUNIT_TEST ( dump_where ); @@ -466,7 +465,7 @@ public: CPPUNIT_ASSERT( oid == 0 ); img->enable(true); - img->disk_attribute(disk, &index, img_type); + img->disk_attribute(disk, &index, &img_type); value = disk->vector_value("TARGET"); @@ -488,7 +487,7 @@ public: img = imp->get(oid, false); img->enable(true); - img->disk_attribute(disk, &index, img_type); + img->disk_attribute(disk, &index, &img_type); value = disk->vector_value("TARGET"); CPPUNIT_ASSERT(value == "hdc"); @@ -509,7 +508,7 @@ public: img = imp->get(oid, false); img->enable(true); - img->disk_attribute(disk, &index, img_type); + img->disk_attribute(disk, &index, &img_type); value = disk->vector_value("TARGET"); CPPUNIT_ASSERT(value == "hde"); @@ -530,7 +529,7 @@ public: img = imp->get(oid, false); img->enable(true); - img->disk_attribute(disk, &index, img_type); + img->disk_attribute(disk, &index, &img_type); value = disk->vector_value("TARGET"); CPPUNIT_ASSERT(value == "sdf"); @@ -562,7 +561,7 @@ public: disk = new VectorAttribute("DISK"); img->enable(true); - img->disk_attribute(disk, &index, img_type); + img->disk_attribute(disk, &index, &img_type); value = ""; value = disk->vector_value("BUS"); @@ -582,7 +581,7 @@ public: disk->replace("BUS", "SCSI"); img->enable(true); - img->disk_attribute(disk, &index, img_type); + img->disk_attribute(disk, &index, &img_type); value = disk->vector_value("BUS"); CPPUNIT_ASSERT( value == "SCSI" ); @@ -596,137 +595,6 @@ public: delete disk; } -/* -------------------------------------------------------------------------- */ -/* -------------------------------------------------------------------------- */ - - void disk_overwrite() - { - ImagePool * imp = static_cast(pool); - Image * img; - - VectorAttribute * disk; - int oid, rc; - string value; - int index = 0; - Image::ImageType img_type; - - // --------------------------------------------------------------------- - // Allocate an OS type image - oid = allocate(0); - CPPUNIT_ASSERT( oid > -1 ); - img = imp->get(oid, false); - - // Disk with overwrite=yes, save_as empty - disk = new VectorAttribute("DISK"); - - disk->replace("OVERWRITE", "yes"); - - img->enable(true); - rc = img->disk_attribute(disk, &index, img_type); - CPPUNIT_ASSERT( rc == 0 ); - - - value = disk->vector_value("OVERWRITE"); - CPPUNIT_ASSERT( value == "YES" ); - - value = ""; - value = disk->vector_value("SAVE_AS"); - CPPUNIT_ASSERT( value == "" ); - - value = ""; - value = disk->vector_value("CLONE"); - CPPUNIT_ASSERT( value == "NO" ); - - value = ""; - value = disk->vector_value("SAVE"); - CPPUNIT_ASSERT( value == "YES" ); - - value = ""; - value = disk->vector_value("READONLY"); - CPPUNIT_ASSERT( value == "NO" ); - - // clean up - delete disk; - - - // --------------------------------------------------------------------- - // Allocate an OS type image - oid = allocate(1); - CPPUNIT_ASSERT( oid > -1 ); - img = imp->get(oid, false); - - // Disk with overwrite=no, save_as not empty - disk = new VectorAttribute("DISK"); - - disk->replace("OVERWRITE", "NO"); - disk->replace("SAVE_AS", "path_to_save"); - - img->enable(true); - rc = img->disk_attribute(disk, &index, img_type); - CPPUNIT_ASSERT( rc == 0 ); - - value = ""; - value = disk->vector_value("OVERWRITE"); - CPPUNIT_ASSERT( value == "NO" ); - - value = ""; - value = disk->vector_value("SAVE_AS"); - CPPUNIT_ASSERT( value == "path_to_save" ); - - value = ""; - value = disk->vector_value("CLONE"); - CPPUNIT_ASSERT( value == "YES" ); - - value = ""; - value = disk->vector_value("SAVE"); - CPPUNIT_ASSERT( value == "YES" ); - - value = ""; - value = disk->vector_value("READONLY"); - CPPUNIT_ASSERT( value == "NO" ); - - // clean up - delete disk; - - // --------------------------------------------------------------------- - // Allocate an OS type image - oid = allocate(2); - CPPUNIT_ASSERT( oid > -1 ); - img = imp->get(oid, false); - - // Disk with overwrite=no, save_as not present - disk = new VectorAttribute("DISK"); - - disk->replace("OVERWRITE", "NO"); - - img->enable(true); - rc = img->disk_attribute(disk, &index, img_type); - CPPUNIT_ASSERT( rc == 0 ); - - value = ""; - value = disk->vector_value("OVERWRITE"); - CPPUNIT_ASSERT( value == "NO" ); - - value = ""; - value = disk->vector_value("SAVE_AS"); - CPPUNIT_ASSERT( value == "" ); - - value = ""; - value = disk->vector_value("CLONE"); - CPPUNIT_ASSERT( value == "YES" ); - - value = ""; - value = disk->vector_value("SAVE"); - CPPUNIT_ASSERT( value == "NO" ); - - value = ""; - value = disk->vector_value("READONLY"); - CPPUNIT_ASSERT( value == "NO" ); - - // clean up - delete disk; - } - /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ @@ -736,7 +604,7 @@ public: Image * img; VectorAttribute * disk; - int oid_0, oid_1; + int oid_0, oid_1, index; string value; Image::ImageType img_type; @@ -770,7 +638,7 @@ public: disk = new VectorAttribute("DISK"); disk->replace("IMAGE", "Image 0"); - ((ImagePool*)imp)->disk_attribute(disk, 0, img_type); + ((ImagePool*)imp)->disk_attribute(disk, 0, &index, &img_type); value = ""; value = disk->vector_value("TARGET"); @@ -787,7 +655,7 @@ public: disk = new VectorAttribute("DISK"); disk->replace("IMAGE_ID", "1"); - ((ImagePool*)imp)->disk_attribute(disk, 0, img_type); + ((ImagePool*)imp)->disk_attribute(disk, 0, &index, &img_type); value = ""; value = disk->vector_value("TARGET");