From: Jeff Applewhite <jeff.applewhite@netapp.com>
Date: Thu, 30 Jan 2014 19:11:08 +0000 (-0500)
Subject: Fixes cinder failed to create/restore a backup with NFS driver
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=10108f4d2e640a9fc12037ece39a833421d27149;p=openstack-build%2Fcinder-build.git

Fixes cinder failed to create/restore a backup with NFS driver

The action cinder backup-create fails when trying to backup a newly
created volume when using cinder.volume.drivers.nfs.NfsDriver. This
patch removes not implemented stubs for backup_volume and
restore_volume. The inherited methods in cinder/volume/driver.py
succeed in creating a backup and in restoring it. After manual
testing of this change backups/restores succeed without the not
implemented stubs. This change also adds the not implemented
stubs to the glusterfs driver until a fix is submitted.

Closes-Bug: #1247743

Change-Id: I5478d00442ce855c91a7f04c5ba2b40733d44902
---

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index 3b7aa983d..0b15de387 100644
--- a/cinder/volume/drivers/glusterfs.py
+++ b/cinder/volume/drivers/glusterfs.py
@@ -1145,3 +1145,11 @@ class GlusterfsDriver(nfs.RemoteFsDriver):
 
     def _get_mount_point_base(self):
         return self.base
+
+    def backup_volume(self, context, backup, backup_service):
+        """Create a new backup from an existing volume."""
+        raise NotImplementedError()
+
+    def restore_backup(self, context, backup, volume, backup_service):
+        """Restore an existing backup to a new or existing volume."""
+        raise NotImplementedError()
diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index 24091f5ef..5bf0115f8 100644
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -371,14 +371,6 @@ class RemoteFsDriver(driver.VolumeDriver):
     def _ensure_share_mounted(self, nfs_share):
         raise NotImplementedError()
 
-    def backup_volume(self, context, backup, backup_service):
-        """Create a new backup from an existing volume."""
-        raise NotImplementedError()
-
-    def restore_backup(self, context, backup, volume, backup_service):
-        """Restore an existing backup to a new or existing volume."""
-        raise NotImplementedError()
-
 
 class NfsDriver(RemoteFsDriver):
     """NFS based cinder driver. Creates file on NFS share for using it