You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2012/10/09 11:17:15 UTC
git commit: FGCP: return empty array instead of error when no data
Updated Branches:
refs/heads/master ccd33dccc -> ab8a476b2
FGCP: return empty array instead of error when no data
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/ab8a476b
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/ab8a476b
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/ab8a476b
Branch: refs/heads/master
Commit: ab8a476b290a3d6033af1411a3aca78336981de5
Parents: ccd33dc
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Sun Sep 9 23:40:20 2012 +1000
Committer: marios <ma...@redhat.com>
Committed: Tue Oct 9 12:16:11 2012 +0300
----------------------------------------------------------------------
server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 43 ++++++++++++----
1 files changed, 32 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ab8a476b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
index 82c2141..b92c251 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -404,7 +404,12 @@ class FgcpDriver < Deltacloud::BaseDriver
safely do
client = new_client(credentials)
if opts and opts[:id]
- vdisk = client.get_vdisk_attributes(opts[:id])['vdisk'][0]
+ begin
+ vdisk = client.get_vdisk_attributes(opts[:id])['vdisk'][0]
+ rescue Exception => ex
+ return [] if ex.message =~ /VALIDATION_ERROR.*t exist./
+ raise
+ end
state = client.get_vdisk_status(opts[:id])['vdiskStatus'][0]
actions = []
if state == 'NORMAL'
@@ -528,18 +533,24 @@ class FgcpDriver < Deltacloud::BaseDriver
if opts and opts[:id]
vdisk_id, backup_id = split_snapshot_id(opts[:id])
- if backups = client.list_vdisk_backup(vdisk_id)['backups']
+ begin
+ if backups = client.list_vdisk_backup(vdisk_id)['backups']
- backups[0]['backup'].each do |backup|
+ backups[0]['backup'].each do |backup|
- snapshots << StorageSnapshot.new(
- :id => opts[:id],
- #:state => ?,
- :storage_volume_id => vdisk_id,
- :created => backup['backupTime'][0]
- ) if backup_id = backup['backupId'][0]
+ snapshots << StorageSnapshot.new(
+ :id => opts[:id],
+ #:state => ?,
+ :storage_volume_id => vdisk_id,
+ :created => backup['backupTime'][0]
+ ) if backup_id = backup['backupId'][0]
+ end
end
+ rescue Exception => ex
+ return [] if ex.message =~ /RESOURCE_NOT_FOUND/
+ raise
end
+
elsif xml = client.list_vsys['vsyss']
return [] if xml.nil?
@@ -834,7 +845,12 @@ class FgcpDriver < Deltacloud::BaseDriver
</Request>
eofwpxml
- fw = client.get_efm_configuration(opts[:id], 'FW_POLICY', configuration_xml)
+ begin
+ fw = client.get_efm_configuration(opts[:id], 'FW_POLICY', configuration_xml)
+ rescue Exception => ex
+ return [] if ex.message =~ /RESOURCE_NOT_FOUND/
+ raise
+ end
fw_name = fw['efm'][0]['efmName'][0] # currently always 'Firewall'
fw_owner_id = fw['efm'][0]['creator'][0]
rule50000_log = true
@@ -1214,7 +1230,12 @@ eofwopxml
def metric(credentials, opts={})
safely do
client = new_client(credentials)
- perf = client.get_performance_information(opts[:id], 'hour')
+ begin
+ perf = client.get_performance_information(opts[:id], 'hour')
+ rescue Exception => ex
+ return nil if ex.message =~ /RESOURCE_NOT_FOUND/
+ raise
+ end
metric = Metric.new(
:id => opts[:id],