From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 24 Feb 2016 19:54:47 +0000 (+0000)
Subject: Merge "NetApp: Support iSCSI CHAP Uni-directional Auth"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8ed2d59395611ec2dc0ed78e8290af66bd02b1f2;p=openstack-build%2Fcinder-build.git

Merge "NetApp: Support iSCSI CHAP Uni-directional Auth"
---

8ed2d59395611ec2dc0ed78e8290af66bd02b1f2
diff --cc cinder/volume/drivers/netapp/dataontap/client/api.py
index 4d729f99e,2b22a14bb..2ba813b30
--- a/cinder/volume/drivers/netapp/dataontap/client/api.py
+++ b/cinder/volume/drivers/netapp/dataontap/client/api.py
@@@ -390,10 -394,10 +394,10 @@@ class NaElement(object)
      def get_attr_names(self):
          """Returns the list of attribute names."""
          attributes = self._element.attrib or {}
 -        return attributes.keys()
 +        return list(attributes.keys())
  
      def add_new_child(self, name, content, convert=False):
-         """Add child with tag name and context.
+         """Add child with tag name and content.
  
             Convert replaces entity refs to chars.
          """