From ab87cfbcad3dfab678217499ee8dfdbcde7023c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Thu, 13 Nov 2008 18:05:10 +0000 Subject: [PATCH] Fixed bug in ruby clients. Prettifying onenetwork show output. git-svn-id: http://svn.opennebula.org/one/trunk@232 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/client/ruby/one.rb | 2 +- src/vnm/Leases.cc | 5 ----- src/vnm/VirtualNetwork.cc | 6 +++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/client/ruby/one.rb b/src/client/ruby/one.rb index 51e8358181..2dcbfa4312 100644 --- a/src/client/ruby/one.rb +++ b/src/client/ruby/one.rb @@ -42,7 +42,7 @@ module ONE last_mon_time managed}, "host_attributes" => %w{id name type value}, "host_shares" => %w{hid endpoint disk_usage mem_usage - cpu_usage max_disk max_mem max_cpu running_vms} + cpu_usage max_disk max_mem max_cpu running_vms}, "network_pool" => %w{oid uid name type bridge}, "vn_template" => %w{id name type value} } diff --git a/src/vnm/Leases.cc b/src/vnm/Leases.cc index 82d14a3a36..0cb73534ad 100644 --- a/src/vnm/Leases.cc +++ b/src/vnm/Leases.cc @@ -391,11 +391,6 @@ ostream& operator<<(ostream& os, Leases& _leases) { map::iterator it; - os << "NID : " << _leases.oid << endl; - os << "SIZE : " << _leases.size << endl; - - os << "Leases:" << endl; - // Iterate all the leases for(it=_leases.leases.begin();it!=_leases.leases.end();it++) { diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc index 9a2077cd4e..9787e2c1fb 100644 --- a/src/vnm/VirtualNetwork.cc +++ b/src/vnm/VirtualNetwork.cc @@ -404,11 +404,11 @@ ostream& operator<<(ostream& os, VirtualNetwork& vn) os << "Fixed" << endl; } os << "Size : " << vn.get_size() << endl; - os << "Bridge : " << vn.bridge << endl; + os << "Bridge : " << vn.bridge << endl << endl; - os << "Template" << endl << vn.vn_template << endl; + os << "....: Template :...." << vn.vn_template << endl << endl; - os << "Leases" << endl << *(vn.leases) << endl; + os << "....: Leases :...." << endl << *(vn.leases) << endl; return os; };