Merge branch 'internal' into 'master'

[Internal: support systemtags for more api]

See merge request zstackio/zstack!5974

Author: gitlab

header/src/main/java/org/zstack/header/image/APICreateDataVolumeTemplateFromVolumeMsg.java

@@ -6,6 +6,7 @@
 import org.zstack.header.other.APIAuditor;
 import org.zstack.header.rest.RestRequest;
 import org.zstack.header.storage.backup.BackupStorageVO;
+import org.zstack.header.tag.TagResourceType;
 import org.zstack.header.volume.VolumeVO;
 
 import java.util.Collections;
@@ -21,6 +22,7 @@
         parameterName = "params",
         responseClass = APICreateDataVolumeTemplateFromVolumeEvent.class
 )
+@TagResourceType(ImageVO.class)
 @DefaultTimeout(timeunit = TimeUnit.HOURS, value = 72)
 public class APICreateDataVolumeTemplateFromVolumeMsg extends APICreateMessage implements APIAuditor {
     @APIParam(maxLength = 255)

header/src/main/java/org/zstack/header/image/APICreateDataVolumeTemplateFromVolumeSnapshotMsg.java

@@ -7,6 +7,7 @@
 import org.zstack.header.rest.RestRequest;
 import org.zstack.header.storage.backup.BackupStorageVO;
 import org.zstack.header.storage.snapshot.VolumeSnapshotVO;
+import org.zstack.header.tag.TagResourceType;
 
 import java.util.Collections;
 import java.util.List;
@@ -21,6 +22,7 @@
         method = HttpMethod.POST,
         parameterName = "params"
 )
+@TagResourceType(ImageVO.class)
 @DefaultTimeout(timeunit = TimeUnit.HOURS, value = 72)
 public class APICreateDataVolumeTemplateFromVolumeSnapshotMsg extends APICreateMessage implements APIAuditor {
     @APIParam(resourceType = VolumeSnapshotVO.class, checkAccount = true, operationTarget = true)

header/src/main/java/org/zstack/header/image/APICreateRootVolumeTemplateFromRootVolumeMsg.java

@@ -6,6 +6,7 @@
 import org.zstack.header.other.APIAuditor;
 import org.zstack.header.rest.RestRequest;
 import org.zstack.header.storage.backup.BackupStorageVO;
+import org.zstack.header.tag.TagResourceType;
 import org.zstack.header.volume.VolumeVO;
 
 import java.util.Collections;
@@ -19,6 +20,7 @@
         responseClass = APICreateRootVolumeTemplateFromRootVolumeEvent.class,
         parameterName = "params"
 )
+@TagResourceType(ImageVO.class)
 @DefaultTimeout(timeunit = TimeUnit.HOURS, value = 72)
 public class APICreateRootVolumeTemplateFromRootVolumeMsg extends APICreateMessage implements APIAuditor {
     @APIParam(maxLength = 255)

header/src/main/java/org/zstack/header/image/APICreateRootVolumeTemplateFromVolumeSnapshotMsg.java

@@ -7,6 +7,7 @@
 import org.zstack.header.rest.RestRequest;
 import org.zstack.header.storage.backup.BackupStorageVO;
 import org.zstack.header.storage.snapshot.VolumeSnapshotVO;
+import org.zstack.header.tag.TagResourceType;
 
 import java.util.Collections;
 import java.util.List;
@@ -21,6 +22,7 @@
         method = HttpMethod.POST,
         parameterName = "params"
 )
+@TagResourceType(ImageVO.class)
 @DefaultTimeout(timeunit = TimeUnit.HOURS, value = 72)
 public class APICreateRootVolumeTemplateFromVolumeSnapshotMsg extends APICreateMessage implements APIAuditor {
     @APIParam(resourceType = VolumeSnapshotVO.class, checkAccount = true, operationTarget = true)