From 24151f9aec65771e2c2c7a74b4b15bad2f1969e7 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 12 Jul 2011 16:19:32 +0200 Subject: [PATCH 1/2] feature #346: used leases now appear on onevnet show command --- src/cli/one_helper/onevnet_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 3d46a45aad..8b1a94c5be 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -51,11 +51,12 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper CLIHelper.print_header(str_h1 % ["VIRTUAL NETWORK #{vn.id.to_s} INFORMATION"]) - str="%-10s: %-20s" + str="%-15s: %-20s" puts str % ["ID", vn.id.to_s] puts str % ["USER", vn['UNAME']] puts str % ["GROUP", vn['GNAME']] puts str % ["PUBLIC", OpenNebulaHelper.boolean_to_str(vn['PUBLIC'])] + puts str % ["USED LEASES", vn['TOTAL_LEASES']] puts CLIHelper.print_header(str_h1 % ["VIRTUAL NETWORK TEMPLATE"], false) From d91237f4d76428d8ade4c1ef2946d432a9c625b9 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 12 Jul 2011 16:21:14 +0200 Subject: [PATCH 2/2] Delete deprecated values from sunstone-server.conf --- src/sunstone/etc/sunstone-server.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf index 8855377cb8..a1d8b64246 100644 --- a/src/sunstone/etc/sunstone-server.conf +++ b/src/sunstone/etc/sunstone-server.conf @@ -6,5 +6,3 @@ PORT=9869 VNC_PROXY_BASE_PORT=29876 NOVNC_PATH= -# GRAPH INFO UPDATE INTERVAL (secs) -MONITORING_INTERVAL=600