From 9bebffe6a63af1805cd5987a04ff6afa70e66c37 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 23 Jul 2014 15:48:40 +0200 Subject: [PATCH] feature #3087: add cluster name to onevm show --- src/cli/one_helper/onevm_helper.rb | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index f8086ae136..f6b926a5ba 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -236,6 +236,28 @@ class OneVMHelper < OpenNebulaHelper::OneHelper str_h1="%-80s" str="%-20s: %-20s" + cluster = nil + + if %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str + cluster_id = vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID'] + else + cluster_id = nil + end + + if cluster_id + if cluster_id == "-1" + cluster = "default" + else + clu = OpenNebula::Cluster.new(OpenNebula::Cluster.build_xml(cluster_id), @client) + rc = clu.info + if OpenNebula.is_error?(rc) + cluster = "ERROR" + else + cluster = clu["NAME"] + end + end + end + CLIHelper.print_header( str_h1 % "VIRTUAL MACHINE #{vm['ID']} INFORMATION") puts str % ["ID", vm.id.to_s] @@ -248,9 +270,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper puts str % ["HOST", vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']] if %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str - puts str % ["CLUSTER ID", - vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID'] ] if - %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str + puts str % ["CLUSTER ID", cluster_id ] if cluster_id + puts str % ["CLUSTER", cluster ] if cluster puts str % ["START TIME", OpenNebulaHelper.time_to_str(vm['/VM/STIME'])] puts str % ["END TIME",