Return-Path: X-Original-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 18C597A2D for ; Sat, 20 Aug 2011 01:02:44 +0000 (UTC) Received: (qmail 53201 invoked by uid 500); 20 Aug 2011 01:02:43 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 53175 invoked by uid 500); 20 Aug 2011 01:02:43 -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 53159 invoked by uid 99); 20 Aug 2011 01:02:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Aug 2011 01:02:43 +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 (nike.apache.org: domain of lutter@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; Sat, 20 Aug 2011 01:02:36 +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 p7K12EHR025603 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 19 Aug 2011 21:02:14 -0400 Received: from avon.watzmann.net (ovpn-113-75.phx2.redhat.com [10.3.113.75]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p7K12DT8016910 for ; Fri, 19 Aug 2011 21:02:14 -0400 From: lutter@redhat.com To: deltacloud-dev@incubator.apache.org Subject: [PATCH 2/4] * server.rb (firewalls/new_rule): raise a validation error if no source given Date: Fri, 19 Aug 2011 18:02:06 -0700 Message-Id: <1313802128-9847-3-git-send-email-lutter@redhat.com> In-Reply-To: <1313802128-9847-1-git-send-email-lutter@redhat.com> References: <1313802128-9847-1-git-send-email-lutter@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-Virus-Checked: Checked by ClamAV on apache.org From: David Lutterkort Signed-off-by: David Lutterkort --- server/server.rb | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/server/server.rb b/server/server.rb index 1b50476..e579eca 100644 --- a/server/server.rb +++ b/server/server.rb @@ -1148,7 +1148,11 @@ collection :firewalls do for i in (1..max_groups) do groups.merge!({params["group#{i}"]=>params["group#{i}owner"]}) end - params.merge!( {'addresses' => addresses} ) ; params.merge!( {'groups' => groups} ) + params['addresses'] = addresses + params['groups'] = groups + if addresses.empty? && groups.empty? + raise Deltacloud::Validation::Failure.new(nil, "No sources. Specify at least one source ip_address or group") + end driver.create_firewall_rule(credentials, params) @firewall = driver.firewall(credentials, {:id => params[:id]}) status 201 -- 1.7.6