From 8d356a58413f5bb39a10f2862ec877f2ca914a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Oct 2011 15:21:13 +0200 Subject: [PATCH] Bug #847: Add the auth driver column to oneuser list output --- src/cli/etc/oneuser.yaml | 12 +++++++++--- src/cli/one_helper/oneuser_helper.rb | 6 +++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/cli/etc/oneuser.yaml b/src/cli/etc/oneuser.yaml index f4a75f0b30..377dd40d87 100644 --- a/src/cli/etc/oneuser.yaml +++ b/src/cli/etc/oneuser.yaml @@ -1,15 +1,20 @@ --- :ID: - :desc: ONE identifier for the Template + :desc: ONE identifier for the User :size: 4 :NAME: - :desc: Name of the Template + :desc: Name of the User :size: 15 :left: true :GROUP: - :desc: Group of the Template + :desc: Group of the User + :size: 8 + :left: true + +:AUTH: + :desc: Auth driver of the User :size: 8 :left: true @@ -21,4 +26,5 @@ - :ID - :GROUP - :NAME +- :AUTH - :PASSWORD diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index cc9005b836..185beb974e 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -190,11 +190,15 @@ class OneUserHelper < OpenNebulaHelper::OneHelper helper.group_name(d, options) end + column :AUTH, "Auth driver of the User", :left, :size=>8 do |d| + d["AUTH_DRIVER"] + end + column :PASSWORD, "Password of the User", :size=>50 do |d| d['PASSWORD'] end - default :ID, :GROUP, :NAME, :PASSWORD + default :ID, :GROUP, :NAME, :AUTH, :PASSWORD end table