Merge "Port test_netapp to Python 3"

diff --cc tox.ini
index d15b8fd757ea8b5553cc89e2a2f199e2f713e991,61f6f15f0743b2f204f3505815de91f28de37ff3..9751a62b80eeee244a9067dd42cfeb5d7d368d59
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -79,8 -79,8 +79,9 @@@ commands 
      cinder.tests.unit.test_infortrend_cli \
      cinder.tests.unit.test_migrations \
      cinder.tests.unit.test_misc \
+     cinder.tests.unit.test_netapp \
      cinder.tests.unit.test_netapp_nfs \
 +    cinder.tests.unit.test_netapp_ssc \
      cinder.tests.unit.test_nfs \
      cinder.tests.unit.test_nimble \
      cinder.tests.unit.test_pure \