diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 54b1fb7795..f32f7d4166 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -160,6 +160,21 @@ EOT rid_to_str(:groups, gid, options) end + def user_name(resource, options={}) + if options[:numeric] + resource['UID'] + else + resource['UNAME'] + end + end + + def group_name(resource, options={}) + if options[:numeric] + resource['GID'] + else + resource['GNAME'] + end + end ######################################################################## # Formatters for arguments ######################################################################## diff --git a/src/cli/one_helper/onegroup_helper.rb b/src/cli/one_helper/onegroup_helper.rb index 3d3f8962ee..4a9b65cbd9 100644 --- a/src/cli/one_helper/onegroup_helper.rb +++ b/src/cli/one_helper/onegroup_helper.rb @@ -68,8 +68,9 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper d["NAME"] end - column :USER, "Username of the Group owner", :left, :size=>8 do |d| - helper.uid_to_str(d["UID"], options) + column :USER, "Username of the Group owner", :left, + :size=>8 do |d| + helper.user_name(d, options) end default :ID, :USER, :NAME diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index 228b3d6061..58c41e9cf8 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -87,12 +87,14 @@ class OneImageHelper < OpenNebulaHelper::OneHelper d["NAME"] end - column :USER, "Username of the Virtual Machine owner", :left, :size=>8 do |d| - helper.uid_to_str(d["UID"], options) + column :USER, "Username of the Virtual Machine owner", :left, + :size=>8 do |d| + helper.user_name(d, options) end - column :GROUP, "Group of the Virtual Machine", :left, :size=>8 do |d| - helper.gid_to_str(d["GID"], options) + column :GROUP, "Group of the Virtual Machine", :left, + :size=>8 do |d| + helper.group_name(d, options) end column :TYPE, "Type of the Image", :size=>4 do |d,e| diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index 32ac96be9f..42803c0d24 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -66,12 +66,13 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper d["NAME"] end - column :USER, "Username of the Template owner", :left, :size=>8 do |d| - helper.uid_to_str(d["UID"], options) + column :USER, "Username of the Template owner", :left, + :size=>8 do |d| + helper.user_name(d, options) end column :GROUP, "Group of the Template", :left, :size=>8 do |d| - helper.gid_to_str(d["GID"], options) + helper.group_name(d, options) end column :REGTIME, "Registration time of the Template", :size=>20 do |d| diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 9da8c5a99e..13e275751f 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -112,12 +112,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper d["NAME"] end - column :USER, "Username of the Virtual Machine owner", :left, :size=>8 do |d| - helper.uid_to_str(d["UID"], options) + column :USER, "Username of the Virtual Machine owner", :left, + :size=>8 do |d| + helper.user_name(d, options) end - column :GROUP, "Group of the Virtual Machine", :left, :size=>8 do |d| - helper.gid_to_str(d["GID"], options) + column :GROUP, "Group of the Virtual Machine", :left, + :size=>8 do |d| + helper.group_name(d, options) end column :STAT, "Actual status", :size=>4 do |d,e| diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 85eab99b8c..9e38da0ff7 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -79,12 +79,14 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper d["NAME"] end - column :USER, "Username of the Virtual Network owner", :left, :size=>8 do |d| - helper.uid_to_str(d["UID"], options) + column :USER, "Username of the Virtual Network owner", :left, + :size=>8 do |d| + helper.user_name(d, options) end - column :GROUP, "Group of the Virtual Network", :left, :size=>8 do |d| - helper.gid_to_str(d["GID"], options) + column :GROUP, "Group of the Virtual Network", :left, + :size=>8 do |d| + helper.group_name(d, options) end column :TYPE, "Type of Virtual Network", :size=>6 do |d|