Merge "Fix NetApp AutoSupport Shortcomings."

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

diff --cc cinder/volume/drivers/netapp/iscsi.py
index c518e4e4b71fd6037b773479804adfc9602cde54,6897932d24e534b8727b9a0301d647633b179a19..8b966e641a9e6dfe08b2b6f65d001288fc70eefd
--- 1/cinder/volume/drivers/netapp/iscsi.py
--- 2/cinder/volume/drivers/netapp/iscsi.py
+++ b/cinder/volume/drivers/netapp/iscsi.py
@@@ -87,10 -88,12 +88,11 @@@ class NetAppDirectISCSIDriver(driver.IS
      VERSION = "1.0.0"
  
      IGROUP_PREFIX = 'openstack-'
 -    required_flags = ['netapp_transport_type', 'netapp_login',
 -                      'netapp_password', 'netapp_server_hostname',
 -                      'netapp_server_port']
 +    required_flags = ['netapp_login', 'netapp_password',
 +                      'netapp_server_hostname']
  
      def __init__(self, *args, **kwargs):
+         self._app_version = kwargs.pop("app_version", "unknown")
          super(NetAppDirectISCSIDriver, self).__init__(*args, **kwargs)
          validate_instantiation(**kwargs)
          self.configuration.append_config_values(netapp_connection_opts)

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