From bb11bf9efd6c902615de7c87b050db42fc7e6e02 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Mon, 19 Dec 2011 15:36:59 -0800
Subject: [PATCH] SWIFT :  fixed create template from snapshot

---
 .../resource/NfsSecondaryStorageResource.java |  1 +
 .../storage/snapshot/SnapshotManager.java     |  2 --
 .../storage/snapshot/SnapshotManagerImpl.java | 34 ++-----------------
 3 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
index 20584a2efb1..b77edd9e948 100755
--- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
+++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -393,6 +393,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
                     }
                 }
             }
+
             return new Answer(cmd, true, "success");
         } catch (Exception e) {
             String msg = cmd + " Command failed due to " + e.toString();
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManager.java b/server/src/com/cloud/storage/snapshot/SnapshotManager.java
index ad78e75874f..0aa53fe0250 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManager.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManager.java
@@ -111,8 +111,6 @@ public interface SnapshotManager {
      */
     boolean deleteSnapshotDirsForAccount(long accountId);
 
-    void validateSnapshot(Long userId, SnapshotVO snapshot);
-
     SnapshotPolicyVO getPolicyForVolume(long volumeId);
 
     boolean destroySnapshotBackUp(long snapshotId);
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index fc12c2e064f..86f45595309 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -81,7 +81,6 @@ import com.cloud.storage.Storage;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.StoragePoolVO;
-import com.cloud.storage.SwiftVO;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeVO;
@@ -300,6 +299,8 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
                 s_logger.debug("CreateSnapshot: this is empty snapshot ");
                 snapshot.setPath(preSnapshotPath);
                 snapshot.setBackupSnapshotId(preSnapshotVO.getBackupSnapshotId());
+                snapshot.setSwiftId(preSnapshotVO.getSwiftId());
+
                 snapshot.setStatus(Snapshot.Status.BackedUp);
                 snapshot.setPrevSnapshotId(preId);
                 snapshot.setSecHostId(preSnapshotVO.getSecHostId());
@@ -511,34 +512,6 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
         return createdSnapshot;
     }
 
-    @Override
-    @DB
-    @SuppressWarnings("fallthrough")
-    public void validateSnapshot(Long userId, SnapshotVO snapshot) {
-        assert snapshot != null;
-        Long id = snapshot.getId();
-        Status status = snapshot.getStatus();
-        s_logger.debug("Snapshot scheduler found a snapshot whose actual status is not clear. Snapshot id:" + id + " with DB status: " + status);
-
-        switch (status) {
-        case Creating:
-            // else continue to the next case.
-        case CreatedOnPrimary:
-            // The snapshot has been created on the primary and the DB has been updated.
-            // However, it hasn't entered the backupSnapshotToSecondaryStorage, else
-            // status would have been backing up.
-            // So call backupSnapshotToSecondaryStorage without any fear.
-        case BackingUp:
-            // It has entered backupSnapshotToSecondaryStorage.
-            // But we have no idea whether it was backed up or not.
-            // So call backupSnapshotToSecondaryStorage again.
-            backupSnapshotToSecondaryStorage(snapshot);
-            break;
-        case BackedUp:
-            // No need to do anything as snapshot has already been backed up.
-        }
-    }
-
 
     @Override
     public void deleteSnapshotsForVolume (String secondaryStoragePoolUrl, Long dcId, Long accountId, Long volumeId ){
@@ -605,9 +578,6 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
         
     }
 
-    private SwiftTO toSwiftTO(SwiftVO swift) {
-        return new SwiftTO(swift.getId(), swift.getUrl(), swift.getAccount(), swift.getUserName(), swift.getKey());
-    }
 
     @Override
     @DB