Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 03885956F for ; Tue, 7 Feb 2012 12:24:30 +0000 (UTC) Received: (qmail 17881 invoked by uid 500); 7 Feb 2012 12:24:29 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 17806 invoked by uid 500); 7 Feb 2012 12:24:29 -0000 Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list dev@deltacloud.apache.org Received: (qmail 17794 invoked by uid 99); 7 Feb 2012 12:24:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2012 12:24:28 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of fvollero@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2012 12:24:21 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q17CO0jp009182 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 7 Feb 2012 07:24:00 -0500 Received: from dhcp-2-158.brq.redhat.com (dhcp-2-158.brq.redhat.com [10.34.2.158]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q17CNxAT030590 for ; Tue, 7 Feb 2012 07:24:00 -0500 From: Francesco Vollero To: dev@deltacloud.apache.org Subject: [PATCH core] Improved valid_credentials? method on rhevm and vsphere driver Date: Tue, 7 Feb 2012 13:23:58 +0100 Message-Id: <1328617438-31421-1-git-send-email-fvollero@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Signed-off-by: Francesco Vollero --- .../lib/deltacloud/drivers/rhevm/rhevm_driver.rb | 10 ++++++---- .../deltacloud/drivers/vsphere/vsphere_driver.rb | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb b/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb index 665e2fe..a66b9c6 100644 --- a/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb +++ b/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb @@ -208,13 +208,15 @@ class RHEVMDriver < Deltacloud::BaseDriver end def valid_credentials?(credentials) - retval = true begin - realms(credentials) - rescue + realms(credentials) && true + rescue RestClient::Unauthorized retval = false + rescue => e + safely do + raise e + end end - retval end private diff --git a/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb b/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb index a2a5249..51b6648 100644 --- a/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb +++ b/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb @@ -370,10 +370,13 @@ module Deltacloud::Drivers::VSphere def valid_credentials?(credentials) begin - RbVmomi::VIM.connect(:host => host_endpoint, :user => credentials.user, :password => credentials.password, :insecure => true) - return true - rescue + RbVmomi::VIM.connect(:host => host_endpoint, :user => credentials.user, :password => credentials.password, :insecure => true) && true + rescue RbVmomi::Fault:InvalidLogin return false + rescue => e + safely do + raise e + end end end -- 1.7.7.6