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 AC9C8FDDE for ; Tue, 23 Apr 2013 21:54:36 +0000 (UTC) Received: (qmail 98213 invoked by uid 500); 23 Apr 2013 21:54:36 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 98146 invoked by uid 500); 23 Apr 2013 21:54:36 -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 98134 invoked by uid 99); 23 Apr 2013 21:54:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Apr 2013 21:54:36 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [116.50.57.190] (HELO cluster-k.mailcontrol.com) (116.50.57.190) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Apr 2013 21:54:28 +0000 Received: from mail2.fujitsu.com.au (mail2.fujitsu.com.au [216.14.192.226]) by rly12k.srv.mailcontrol.com (MailControl) with ESMTP id r3NLs0k3009260 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Tue, 23 Apr 2013 22:54:02 +0100 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail2.fujitsu.com.au (Postfix) with ESMTP id 9C0022F509B for ; Wed, 24 Apr 2013 07:54:00 +1000 (EST) X-Virus-Scanned: amavisd-new at mail2.fujitsu.com.au Received: from mail2.fujitsu.com.au ([127.0.0.1]) by localhost (mail2.fujitsu.com.au [127.0.0.1]) (amavisd-new, port 10024) with LMTP id MhoI8LXH2ntK for ; Wed, 24 Apr 2013 07:54:00 +1000 (EST) Received: from SYD0633.au.fujitsu.com (unknown [137.172.78.132]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client did not present a certificate) by mail2.fujitsu.com.au (Postfix) with ESMTP id 79D1C2F5094 for ; Wed, 24 Apr 2013 07:54:00 +1000 (EST) Received: from mailfilter1.au.fjanz.com (137.172.19.78) by SYD0633.au.fujitsu.com (137.172.78.132) with Microsoft SMTP Server id 8.3.83.0; Wed, 24 Apr 2013 07:53:57 +1000 Received: from RadwareLoad Balancer (137.172.78.70) [137.172.78.70] by mailfilter1.au.fjanz.com - Websense Email Security (7.0.0); Wed, 24 Apr 2013 07:53:59 +1000 Received: from FALEX03.au.fjanz.com ([137.172.72.103]) by SYD0630.au.fjanz.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 24 Apr 2013 07:53:52 +1000 Received: from localhost ([10.44.213.60]) by FALEX03.au.fjanz.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 24 Apr 2013 07:53:51 +1000 From: To: Subject: [PATCH] FGCP: change 2nd param to start/stop_system from opts to id Date: Wed, 24 Apr 2013 07:53:51 +1000 Message-ID: <1366754031-4860-1-git-send-email-diesk@fast.au.fujitsu.com> X-Mailer: git-send-email 1.8.0.msysgit.0 X-OriginalArrivalTime: 23 Apr 2013 21:53:51.0971 (UTC) FILETIME=[0AF42B30:01CE406D] X-SEF-Processed: 7_0_0_00239__2013_04_24_07_54_00 MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MailControl 14771.152 (www.mailcontrol.com) on 10.75.0.122 X-Virus-Checked: Checked by ClamAV on apache.org From: Dies Koper --- .../lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb index 0d21acb..e57bb2d 100644 --- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb +++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb @@ -99,12 +99,10 @@ module Deltacloud::Drivers::Fgcp delete_firewall(credentials, :id => "#{id}-S-0001") end - def start_system(credentials, opts={}) + def start_system(credentials, id) safely do client = new_client(credentials) - context = opts[:env] - vsys_id = opts[:id] - xml = client.list_vservers(vsys_id)['vservers'] + xml = client.list_vservers(id)['vservers'] return unless xml and xml[0]['vserver'] # FIXME: maybe this should be done in a separate thread (in case of gigantic number of servers) @@ -119,12 +117,10 @@ module Deltacloud::Drivers::Fgcp end end - def stop_system(credentials, opts={}) + def stop_system(credentials, id) safely do client = new_client(credentials) - context = opts[:env] - vsys_id = opts[:id] - xml = client.list_vservers(vsys_id)['vservers'] + xml = client.list_vservers(id)['vservers'] return unless xml and xml[0]['vserver'] # FIXME: maybe this should be done in a separate thread (in case of gigantic number of servers) -- 1.8.0.msysgit.0