Added pool type to volumes created from snapshots

Pool type to volumes that are created from snapshots
Added StorPool tags to snapshots that are copied from remote

Author: slavkap

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java

@@ -676,6 +676,7 @@ public void copyAsync(DataObject srcData, DataObject dstData, AsyncCompletionCal
                     VolumeObjectTO to = (VolumeObjectTO)dstData.getTO();
                     to.setPath(StorPoolUtil.devPath(StorPoolUtil.getNameFromResponse(resp, false)));
                     to.setSize(size);
+                    updateVolumePoolType(vinfo);
 
                     answer = new CopyCmdAnswer(to);
                     StorPoolUtil.spLog("Created volume=%s with uuid=%s from snapshot=%s with uuid=%s", StorPoolUtil.getNameFromResponse(resp, false), volumeName, snapshotName, sinfo.getUuid());

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolUtil.java

@@ -707,13 +707,14 @@ public static String getSnapshotClusterId(String snapshotName, SpConnectionDesc
         return json.get("clusterId").getAsString();
     }
 
-    public static SpApiResponse snapshotFromRemote(String name, String remoteLocation, String template,
+    public static SpApiResponse snapshotFromRemote(String name, String remoteLocation, String template, Map<String, String> tags,
             SpConnectionDesc conn) {
         Map<String, Object> json = new HashMap<>();
         json.put("remoteId", name);
         json.put("remoteLocation", remoteLocation);
         json.put("template", template);
         json.put("name", "");
+        json.put("tags", tags);
         return POST("SnapshotFromRemote", json, conn);
     }
 

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java

@@ -33,6 +33,8 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.NoTransitionException;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
@@ -477,11 +479,20 @@ private SpApiResponse copySnapshotFromRemote(DataObject snapshot, StoragePoolVO
                 .valueIn(snapshot.getDataStore().getId());
         StoragePoolDetailVO template = storagePoolDetailsDao.findDetail(storagePoolVO.getId(),
                 StorPoolUtil.SP_TEMPLATE);
+        Map<String, String> tags = addStorPoolTags(snapshot);
         SpApiResponse respFromRemote = StorPoolUtil.snapshotFromRemote(snapshotName, localLocation,
-                template.getValue(), connectionRemote);
+                template.getValue(), tags, connectionRemote);
         return respFromRemote;
     }
 
+    @NotNull
+    private static Map<String, String> addStorPoolTags(DataObject snapshot) {
+        Map<String, String> tags = new HashMap<>();
+        tags.put("cs", "snapshot");
+        tags.put("uuid", snapshot.getUuid());
+        return tags;
+    }
+
     private void keepExportedSnapshot(DataObject snapshot, String location, String snapshotName) {
 
         String detail = "~" + snapshotName + ";" + location;