Return-Path: Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: (qmail 52283 invoked from network); 16 Dec 2010 22:13:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Dec 2010 22:13:44 -0000 Received: (qmail 94409 invoked by uid 500); 16 Dec 2010 22:13:44 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 94383 invoked by uid 500); 16 Dec 2010 22:13:44 -0000 Mailing-List: contact deltacloud-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-dev@incubator.apache.org Received: (qmail 94375 invoked by uid 99); 16 Dec 2010 22:13:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 22:13:44 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=10.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 tcrawley@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; Thu, 16 Dec 2010 22:13:38 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBGMDH6R002329 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 16 Dec 2010 17:13:17 -0500 Received: from katahdin.redhat.com (ovpn-113-60.phx2.redhat.com [10.3.113.60]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oBGMDFQk025951 for ; Thu, 16 Dec 2010 17:13:17 -0500 From: tcrawley@redhat.com To: deltacloud-dev@incubator.apache.org Subject: [PATCH 2/4] Don't convert in_use to in-use, because the client will kindly convert it back. Date: Thu, 16 Dec 2010 17:13:13 -0500 Message-Id: <1292537595-773-3-git-send-email-tcrawley@redhat.com> In-Reply-To: <1292537595-773-1-git-send-email-tcrawley@redhat.com> References: <1292537595-773-1-git-send-email-tcrawley@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 From: Tobias Crawley See client/lib/deltacloud.rb:144 --- server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb index 77304c0..cfa45de 100644 --- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb +++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb @@ -561,8 +561,7 @@ module Deltacloud StorageVolume.new( :id => volume[:aws_id], :created => volume[:aws_created_at], - # Fix IN_USE to be IN-USE - :state => volume[:aws_status] ? volume[:aws_status].tr('_', '-').upcase : 'unknown', + :state => volume[:aws_status] ? volume[:aws_status].upcase : 'unknown', :capacity => volume[:aws_size], :instance_id => volume[:aws_instance_id], :realm_id => volume[:zone], -- 1.7.3.2