From: abhiram_moturi <abhiram.moturi@oracle.com>
Date: Thu, 15 Jan 2015 16:31:53 +0000 (-0500)
Subject: Fix zfssa driver volume attach to work with latest zfssa software
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d47171701646db0bfca5f0026b3a6db08176bde6;p=openstack-build%2Fcinder-build.git

Fix zfssa driver volume attach to work with latest zfssa software

This fixes the volume attach issue of the zfssa driver
with the latest zfssa software release and makes it work
for all zfssa versions.

Change-Id: I4b9ceb7788c112ee5998f24b00a07d4346bc6275
Closes-Bug: #1411291
---

diff --git a/cinder/volume/drivers/zfssa/zfssarest.py b/cinder/volume/drivers/zfssa/zfssarest.py
index 6e6981bc6..36190357e 100644
--- a/cinder/volume/drivers/zfssa/zfssarest.py
+++ b/cinder/volume/drivers/zfssa/zfssarest.py
@@ -445,6 +445,8 @@ class ZFSSAApi(object):
         }
         if 'origin' in val['lun']:
             ret.update({'origin': val['lun']['origin']})
+        if isinstance(ret['number'], list):
+            ret['number'] = ret['number'][0]
 
         return ret