Merge "Revert "Removing Netapp FC drivers for no reported CI""

cinder/tests/volume/drivers/netapp/test_common.py

@@ -19,6 +19,7 @@ from cinder import exception
 from cinder import test
 import cinder.tests.volume.drivers.netapp.fakes as na_fakes
 import cinder.volume.drivers.netapp.common as na_common
+import cinder.volume.drivers.netapp.dataontap.fc_cmode as fc_cmode
 import cinder.volume.drivers.netapp.utils as na_utils
 
 
@@ -96,6 +97,16 @@ class NetAppDriverFactoryTestCase(test.TestCase):
                     family, protocol, **kwargs)
                 self.assertEqual(full_class_name, get_full_class_name(driver))
 
+    def test_create_driver_case_insensitive(self):
+
+        kwargs = {'configuration': na_fakes.create_configuration(),
+                  'app_version': 'fake_info'}
+
+        driver = na_common.NetAppDriver.create_driver('ONTAP_CLUSTER', 'FC',
+                                                      **kwargs)
+
+        self.assertIsInstance(driver, fc_cmode.NetAppCmodeFibreChannelDriver)
+
     def test_create_driver_invalid_family(self):
 
         kwargs = {'configuration': na_fakes.create_configuration(),

cinder/volume/drivers/netapp/common.py

@@ -39,11 +39,13 @@ NETAPP_UNIFIED_DRIVER_REGISTRY = {
     {
         'iscsi': DATAONTAP_PATH + '.iscsi_cmode.NetAppCmodeISCSIDriver',
         'nfs': DATAONTAP_PATH + '.nfs_cmode.NetAppCmodeNfsDriver',
+        'fc': DATAONTAP_PATH + '.fc_cmode.NetAppCmodeFibreChannelDriver'
     },
     'ontap_7mode':
     {
         'iscsi': DATAONTAP_PATH + '.iscsi_7mode.NetApp7modeISCSIDriver',
         'nfs': DATAONTAP_PATH + '.nfs_7mode.NetApp7modeNfsDriver',
+        'fc': DATAONTAP_PATH + '.fc_7mode.NetApp7modeFibreChannelDriver'
     },
     'eseries':
     {

cinder/volume/drivers/netapp/dataontap/fc_7mode.py

@@ -0,0 +1,86 @@
+# Copyright (c) - 2014, Clinton Knight.  All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+"""
+Volume driver for NetApp Data ONTAP (7-mode) FibreChannel storage systems.
+"""
+
+from oslo_log import log as logging
+
+from cinder.volume import driver
+from cinder.volume.drivers.netapp.dataontap import block_7mode
+from cinder.zonemanager import utils as fczm_utils
+
+LOG = logging.getLogger(__name__)
+
+
+class NetApp7modeFibreChannelDriver(driver.FibreChannelDriver):
+    """NetApp 7-mode FibreChannel volume driver."""
+
+    DRIVER_NAME = 'NetApp_FibreChannel_7mode_direct'
+
+    def __init__(self, *args, **kwargs):
+        super(NetApp7modeFibreChannelDriver, self).__init__(*args, **kwargs)
+        self.library = block_7mode.NetAppBlockStorage7modeLibrary(
+            self.DRIVER_NAME, 'FC', **kwargs)
+
+    def do_setup(self, context):
+        self.library.do_setup(context)
+
+    def check_for_setup_error(self):
+        self.library.check_for_setup_error()
+
+    def create_volume(self, volume):
+        self.library.create_volume(volume)
+
+    def create_volume_from_snapshot(self, volume, snapshot):
+        self.library.create_volume_from_snapshot(volume, snapshot)
+
+    def create_cloned_volume(self, volume, src_vref):
+        self.library.create_cloned_volume(volume, src_vref)
+
+    def delete_volume(self, volume):
+        self.library.delete_volume(volume)
+
+    def create_snapshot(self, snapshot):
+        self.library.create_snapshot(snapshot)
+
+    def delete_snapshot(self, snapshot):
+        self.library.delete_snapshot(snapshot)
+
+    def get_volume_stats(self, refresh=False):
+        return self.library.get_volume_stats(refresh)
+
+    def extend_volume(self, volume, new_size):
+        self.library.extend_volume(volume, new_size)
+
+    def ensure_export(self, context, volume):
+        return self.library.ensure_export(context, volume)
+
+    def create_export(self, context, volume):
+        return self.library.create_export(context, volume)
+
+    def remove_export(self, context, volume):
+        self.library.remove_export(context, volume)
+
+    @fczm_utils.AddFCZone
+    def initialize_connection(self, volume, connector):
+        return self.library.initialize_connection_fc(volume, connector)
+
+    @fczm_utils.RemoveFCZone
+    def terminate_connection(self, volume, connector, **kwargs):
+        return self.library.terminate_connection_fc(volume, connector,
+                                                    **kwargs)
+
+    def get_pool(self, volume):
+        return self.library.get_pool(volume)

cinder/volume/drivers/netapp/dataontap/fc_cmode.py

@@ -0,0 +1,86 @@
+# Copyright (c) - 2014, Clinton Knight.  All rights reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+"""
+Volume driver for NetApp Data ONTAP (C-mode) FibreChannel storage systems.
+"""
+
+from oslo_log import log as logging
+
+from cinder.volume import driver
+from cinder.volume.drivers.netapp.dataontap import block_cmode
+from cinder.zonemanager import utils as fczm_utils
+
+LOG = logging.getLogger(__name__)
+
+
+class NetAppCmodeFibreChannelDriver(driver.FibreChannelDriver):
+    """NetApp C-mode FibreChannel volume driver."""
+
+    DRIVER_NAME = 'NetApp_FibreChannel_Cluster_direct'
+
+    def __init__(self, *args, **kwargs):
+        super(NetAppCmodeFibreChannelDriver, self).__init__(*args, **kwargs)
+        self.library = block_cmode.NetAppBlockStorageCmodeLibrary(
+            self.DRIVER_NAME, 'FC', **kwargs)
+
+    def do_setup(self, context):
+        self.library.do_setup(context)
+
+    def check_for_setup_error(self):
+        self.library.check_for_setup_error()
+
+    def create_volume(self, volume):
+        self.library.create_volume(volume)
+
+    def create_volume_from_snapshot(self, volume, snapshot):
+        self.library.create_volume_from_snapshot(volume, snapshot)
+
+    def create_cloned_volume(self, volume, src_vref):
+        self.library.create_cloned_volume(volume, src_vref)
+
+    def delete_volume(self, volume):
+        self.library.delete_volume(volume)
+
+    def create_snapshot(self, snapshot):
+        self.library.create_snapshot(snapshot)
+
+    def delete_snapshot(self, snapshot):
+        self.library.delete_snapshot(snapshot)
+
+    def get_volume_stats(self, refresh=False):
+        return self.library.get_volume_stats(refresh)
+
+    def extend_volume(self, volume, new_size):
+        self.library.extend_volume(volume, new_size)
+
+    def ensure_export(self, context, volume):
+        return self.library.ensure_export(context, volume)
+
+    def create_export(self, context, volume):
+        return self.library.create_export(context, volume)
+
+    def remove_export(self, context, volume):
+        self.library.remove_export(context, volume)
+
+    @fczm_utils.AddFCZone
+    def initialize_connection(self, volume, connector):
+        return self.library.initialize_connection_fc(volume, connector)
+
+    @fczm_utils.RemoveFCZone
+    def terminate_connection(self, volume, connector, **kwargs):
+        return self.library.terminate_connection_fc(volume, connector,
+                                                    **kwargs)
+
+    def get_pool(self, volume):
+        return self.library.get_pool(volume)