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 #1647: Add image/net id to error messages

Browse Source
This commit is contained in:
Carlos Martín 2013-03-11 18:57:44 +01:00
parent 30f6ca80e7
commit 7ac5896a90
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/image/ImageManagerActions.cc
View File

@ -87,6 +87,8 @@ int ImageManager::acquire_image(int vm_id, Image *img, string& error)
{
int rc = 0;
ostringstream oss;
switch(img->get_type())
{
case Image::OS:
@ -97,8 +99,6 @@ int ImageManager::acquire_image(int vm_id, Image *img, string& error)
case Image::KERNEL:
case Image::RAMDISK:
case Image::CONTEXT:
ostringstream oss;
oss << "Image " << img->get_oid() << " (" << img->get_name() << ") "
<< "of type " << Image::type_to_str(img->get_type())
<< " cannot be used as DISK.";
@ -125,7 +125,10 @@ int ImageManager::acquire_image(int vm_id, Image *img, string& error)
break;
case Image::USED_PERS:
error = "Cannot acquire persistent image, it is already in use";
oss << "Cannot acquire image " << img->get_oid()
<< ", it is persistent and already in use";
error = oss.str();
rc = -1;
break;
@ -140,9 +143,8 @@ int ImageManager::acquire_image(int vm_id, Image *img, string& error)
case Image::ERROR:
case Image::DELETE:
case Image::CLONE:
ostringstream oss;
oss << "Cannot acquire image in state: "
<< Image::state_to_str(img->get_state());
oss << "Cannot acquire image " << img->get_oid()
<<", it is in state: " << Image::state_to_str(img->get_state());
error = oss.str();
rc = -1;

5
src/vnm/VirtualNetworkPool.cc
View File

@ -273,7 +273,10 @@ int VirtualNetworkPool::nic_attribute(VectorAttribute * nic,
}
else
{
error = "Cannot get IP/MAC lease from virtual network.";
ostringstream oss;
oss << "Cannot get IP/MAC lease from virtual network " << vnet->get_oid() << ".";
error = oss.str();
}
vnet->unlock();