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

diff --cc cinder/tests/unit/volume/drivers/netapp/dataontap/client/fakes.py
Simple merge

diff --cc cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_api.py
Simple merge

diff --cc cinder/volume/drivers/netapp/dataontap/client/api.py
index 4d729f99e77cae41faa3dd09bdcc50b3ebd579b8,2b22a14bbe09d6e8578c90681954f56eed54493e..2ba813b3094afb1ff8b86fa61751eda3f3238a93
--- 1/cinder/volume/drivers/netapp/dataontap/client/api.py
--- 2/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.
          """

diff --cc cinder/volume/drivers/netapp/utils.py
Simple merge