From: Lynxzh <jmzhang@cn.ibm.com>
Date: Mon, 6 Jan 2014 03:45:33 +0000 (+0800)
Subject: Remove unused message from iogrp_data setup
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ae7fcdab7813dbb2e682b00b817e796a9c30a3f8;p=openstack-build%2Fcinder-build.git

Remove unused message from iogrp_data setup

The iogrp_data is initialized during do_setup loaded.
The vdisk_count is originally used but later removed.
In ValueException raised, the variable is no longer required.
Remove this will give a clearer message when
ValueException raised.

Change-Id: Ib7b6c6a870ddd7932e8da1436d615f9ee458bd93
Closes-Bug: #1266321
---

diff --git a/cinder/volume/drivers/storwize_svc.py b/cinder/volume/drivers/storwize_svc.py
index 547f38ebd..244a47329 100644
--- a/cinder/volume/drivers/storwize_svc.py
+++ b/cinder/volume/drivers/storwize_svc.py
@@ -253,10 +253,9 @@ class StorwizeSVCDriver(san.SanDriver):
             except KeyError:
                 self._handle_keyerror('lsnode', header)
             except ValueError:
-                msg = (_('Expected integers for node_count and vdisk_count, '
-                         'svcinfo lsiogrp returned: %(node)s and %(vdisk)s') %
-                       {'node': iogrp_data['node_count'],
-                        'vdisk': iogrp_data['vdisk_count']})
+                msg = (_('Expected integer for node_count, '
+                         'svcinfo lsiogrp returned: %(node)s') %
+                       {'node': iogrp_data['node_count']})
                 LOG.error(msg)
                 raise exception.VolumeBackendAPIException(data=msg)