Merge branch 'ZSV-11790' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'

<fix>[storage]: update APIScanVmInstanceMetadataFromPrimaryStorageMsg

See merge request zstackio/zstack!9563

Author: gitlab

header/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageMsg.java

@@ -3,14 +3,16 @@
 import org.springframework.http.HttpMethod;
 import org.zstack.header.message.APIMessage;
 import org.zstack.header.message.APIParam;
+import org.zstack.header.message.APISyncCallMessage;
+import org.zstack.header.message.DefaultTimeout;
 import org.zstack.header.rest.RestRequest;
 
 @RestRequest(
         path = "/primary-storage/vm-instances/metadata/scan",
         method = HttpMethod.GET,
-        responseClass = APIScanVmInstanceMetadataFromPrimaryStorageEvent.class
+        responseClass = APIScanVmInstanceMetadataFromPrimaryStorageReply.class
 )
-public class APIScanVmInstanceMetadataFromPrimaryStorageMsg extends APIMessage implements PrimaryStorageMessage {
+public class APIScanVmInstanceMetadataFromPrimaryStorageMsg extends APISyncCallMessage implements PrimaryStorageMessage {
     @APIParam(resourceType = PrimaryStorageVO.class)
     private String uuid;
 

header/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageMsgDoc_zh_cn.groovy

@@ -1,6 +1,6 @@
 package org.zstack.header.storage.primary
 
-import org.zstack.header.storage.primary.APIScanVmInstanceMetadataFromPrimaryStorageEvent
+import org.zstack.header.storage.primary.APIScanVmInstanceMetadataFromPrimaryStorageReply
 
 doc {
 	title "扫描主存储上的云主机元数据"
@@ -52,7 +52,7 @@ doc {
 		}
 
 		response {
-			clz APIScanVmInstanceMetadataFromPrimaryStorageEvent.class
+			clz APIScanVmInstanceMetadataFromPrimaryStorageReply.class
 		}
 	}
 }

…anceMetadataFromPrimaryStorageEvent.java …anceMetadataFromPrimaryStorageReply.javaheader/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageEvent.java renamed to header/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageReply.java header/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageEvent.java renamed to header/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageReply.java

@@ -1,23 +1,15 @@
 package org.zstack.header.storage.primary;
 
-import org.zstack.header.message.APIEvent;
+import org.zstack.header.message.APIReply;
 import org.zstack.header.rest.RestResponse;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RestResponse(fieldsTo = {"all"})
-public class APIScanVmInstanceMetadataFromPrimaryStorageEvent extends APIEvent {
+public class APIScanVmInstanceMetadataFromPrimaryStorageReply extends APIReply {
     private List<VmMetadataScanEntry> vmInstanceMetadata = new ArrayList<>();
 
-    public APIScanVmInstanceMetadataFromPrimaryStorageEvent() {
-        super(null);
-    }
-
-    public APIScanVmInstanceMetadataFromPrimaryStorageEvent(String apiId) {
-        super(apiId);
-    }
-
     public List<VmMetadataScanEntry> getVmInstanceMetadata() {
         return vmInstanceMetadata;
     }
@@ -26,8 +18,8 @@ public void setVmInstanceMetadata(List<VmMetadataScanEntry> vmInstanceMetadata)
         this.vmInstanceMetadata = vmInstanceMetadata == null ? new ArrayList<>() : vmInstanceMetadata;
     }
 
-    public static APIScanVmInstanceMetadataFromPrimaryStorageEvent __example__() {
-        APIScanVmInstanceMetadataFromPrimaryStorageEvent evt = new APIScanVmInstanceMetadataFromPrimaryStorageEvent();
+    public static APIScanVmInstanceMetadataFromPrimaryStorageReply __example__() {
+        APIScanVmInstanceMetadataFromPrimaryStorageReply evt = new APIScanVmInstanceMetadataFromPrimaryStorageReply();
         return evt;
     }
 }

…aFromPrimaryStorageEventDoc_zh_cn.groovy …aFromPrimaryStorageReplyDoc_zh_cn.groovyheader/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageEventDoc_zh_cn.groovy renamed to header/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageReplyDoc_zh_cn.groovy header/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageEventDoc_zh_cn.groovy renamed to header/src/main/java/org/zstack/header/storage/primary/APIScanVmInstanceMetadataFromPrimaryStorageReplyDoc_zh_cn.groovy

@@ -1,6 +1,5 @@
 package org.zstack.header.storage.primary
 
-
 import org.zstack.header.errorcode.ErrorCode
 
 doc {
@@ -9,7 +8,7 @@ doc {
 
 	ref {
 		name "vmInstanceMetadata"
-		path "org.zstack.header.storage.primary.APIScanVmInstanceMetadataFromPrimaryStorageEvent.vmInstanceMetadata"
+		path "org.zstack.header.storage.primary.APIScanVmInstanceMetadataFromPrimaryStorageReply.vmInstanceMetadata"
 		desc "云主机元数据摘要列表"
 		type "List"
 		since "5.0.0"
@@ -23,7 +22,7 @@ doc {
 	}
 	ref {
 		name "error"
-		path "org.zstack.header.storage.primary.APIScanVmInstanceMetadataFromPrimaryStorageEvent.error"
+		path "org.zstack.header.storage.primary.APIScanVmInstanceMetadataFromPrimaryStorageReply.error"
 		desc "错误码，若不为null，则表示操作失败, 操作成功时该字段为null"
 		type "ErrorCode"
 		since "5.0.0"

sdk/src/main/java/org/zstack/sdk/ScanVmInstanceMetadataFromPrimaryStorageAction.java

@@ -46,12 +46,6 @@ public Result throwExceptionIfError() {
     @Param(required = false)
     public String requestIp;
 
-    @NonAPIParam
-    public long timeout = -1;
-
-    @NonAPIParam
-    public long pollingInterval = -1;
-
 
     private Result makeResult(ApiResult res) {
         Result ret = new Result();
@@ -93,7 +87,7 @@ protected RestInfo getRestInfo() {
         info.httpMethod = "GET";
         info.path = "/primary-storage/vm-instances/metadata/scan";
         info.needSession = true;
-        info.needPoll = true;
+        info.needPoll = false;
         info.parameterName = "";
         return info;
     }

storage/src/main/java/org/zstack/storage/primary/PrimaryStorageBase.java

@@ -1877,25 +1877,25 @@ private static String getDeduplicateError(String operationName) {
     }
 
     private void handle(APIScanVmInstanceMetadataFromPrimaryStorageMsg msg) {
-        APIScanVmInstanceMetadataFromPrimaryStorageEvent evt = new APIScanVmInstanceMetadataFromPrimaryStorageEvent(msg.getId());
+        APIScanVmInstanceMetadataFromPrimaryStorageReply reply = new APIScanVmInstanceMetadataFromPrimaryStorageReply();
 
         if (self.getStatus() != PrimaryStorageStatus.Connected) {
-            evt.setError(Platform.operr("primary storage[uuid:%s] is not Connected (status=%s), cannot scan metadata",
+            reply.setError(Platform.operr("primary storage[uuid:%s] is not Connected (status=%s), cannot scan metadata",
                     self.getUuid(), self.getStatus()));
-            bus.publish(evt);
+            bus.reply(msg, reply);
             return;
         }
 
         String psType = Q.New(PrimaryStorageVO.class).select(PrimaryStorageVO_.type).eq(PrimaryStorageVO_.uuid, msg.getPrimaryStorageUuid()).findValue();
         if (psType == null) {
-            evt.setError(Platform.operr("primary storage[uuid:%s] not found", msg.getPrimaryStorageUuid()));
-            bus.publish(evt);
+            reply.setError(Platform.operr("primary storage[uuid:%s] not found", msg.getPrimaryStorageUuid()));
+            bus.reply(msg, reply);
             return;
         }
         VmMetadataPathBuildExtensionPoint ext = pluginRgty.getExtensionFromMap(psType, VmMetadataPathBuildExtensionPoint.class);
         if (ext == null) {
-            evt.setError(Platform.operr("primary storage type %s does not support metadata", psType));
-            bus.publish(evt);
+            reply.setError(Platform.operr("primary storage type %s does not support metadata", psType));
+            bus.reply(msg, reply);
             return;
         }
         String metadataDir = ext.buildMetadataDir(msg.getPrimaryStorageUuid());
@@ -1908,8 +1908,8 @@ private void handle(APIScanVmInstanceMetadataFromPrimaryStorageMsg msg) {
             @Override
             public void run(MessageReply r) {
                 if (!r.isSuccess()) {
-                    evt.setError(r.getError());
-                    bus.publish(evt);
+                    reply.setError(r.getError());
+                    bus.reply(msg, reply);
                     return;
                 }
                 ScanVmInstanceMetadataFromPrimaryStorageReply re = r.castReply();
@@ -1922,8 +1922,8 @@ public void run(MessageReply r) {
                         .filter(e -> e.getVmCategory() != null)
                         .filter(e -> !VmMetadataCategory.VM_TEMPLATE_CACHE.name().equals(e.getVmCategory()))
                         .collect(Collectors.toList());
-                evt.setVmInstanceMetadata(filtered);
-                bus.publish(evt);
+                reply.setVmInstanceMetadata(filtered);
+                bus.reply(msg, reply);
             }
         });
     }