Merge branch 'chore' into '4.6.31'

<fix>[kvm]: restore the original os tag

See merge request zstackio/zstack!3841

Author: gitlab

compute/src/main/java/org/zstack/compute/host/HostSystemTags.java

@@ -17,6 +17,21 @@ public class HostSystemTags {
 
     public static SystemTag LIVE_SNAPSHOT = new SystemTag("capability::liveSnapshot", HostVO.class);
 
+    @Deprecated
+    public static String OS_DISTRIBUTION_TOKEN = "distribution";
+    @Deprecated
+    public static PatternedSystemTag OS_DISTRIBUTION = new PatternedSystemTag(String.format("os::distribution::{%s}", OS_DISTRIBUTION_TOKEN), HostVO.class);
+
+    @Deprecated
+    public static String OS_RELEASE_TOKEN = "release";
+    @Deprecated
+    public static PatternedSystemTag OS_RELEASE = new PatternedSystemTag(String.format("os::release::{%s}", OS_RELEASE_TOKEN), HostVO.class);
+
+    @Deprecated
+    public static String OS_VERSION_TOKEN = "version";
+    @Deprecated
+    public static PatternedSystemTag OS_VERSION = new PatternedSystemTag(String.format("os::version::{%s}", OS_VERSION_TOKEN), HostVO.class);
+
     public static String EXTRA_IPS_TOKEN = "extraips";
     public static PatternedSystemTag EXTRA_IPS = new PatternedSystemTag(String.format("extraips::{%s}", EXTRA_IPS_TOKEN), HostVO.class);
 

conf/db/upgrade/V4.6.31__schema.sql

@@ -56,7 +56,3 @@ DELIMITER ;
 
 call moveOsInfoToKVMHostVO();
 DROP PROCEDURE IF EXISTS moveOsInfoToKVMHostVO;
-
-DELETE FROM `zstack`.`SystemTagVO` WHERE tag LIKE 'os::distribution::%';
-DELETE FROM `zstack`.`SystemTagVO` WHERE tag LIKE 'os::release::%';
-DELETE FROM `zstack`.`SystemTagVO` WHERE tag LIKE 'os::version::%';

plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java

@@ -3715,6 +3715,11 @@ private void updateHostOsInformation(String distro, String release, String versi
         kvmHostVO.setOsRelease(release);
         kvmHostVO.setOsVersion(version);
         self = dbf.updateAndRefresh(kvmHostVO);
+
+        // for compatibility
+        createTagWithoutNonValue(HostSystemTags.OS_DISTRIBUTION, HostSystemTags.OS_DISTRIBUTION_TOKEN, distro, true);
+        createTagWithoutNonValue(HostSystemTags.OS_RELEASE, HostSystemTags.OS_RELEASE_TOKEN, release, true);
+        createTagWithoutNonValue(HostSystemTags.OS_VERSION, HostSystemTags.OS_VERSION_TOKEN, version, true);
     }
 
     private void createTagWithoutNonValue(SystemTag tag, String token, String value, boolean inherent) {

test/src/test/groovy/org/zstack/test/integration/kvm/host/AddHostCase.groovy

@@ -11,10 +11,12 @@ import org.zstack.header.host.HostStatus
 import org.zstack.header.host.HostVO
 import org.zstack.kvm.APIAddKVMHostMsg
 import org.zstack.kvm.AddKVMHostMsg
+import org.zstack.kvm.KVMHostInventory
 import org.zstack.sdk.AddKVMHostAction
 import org.zstack.sdk.ClusterInventory
 import org.zstack.sdk.GetHypervisorTypesResult
 import org.zstack.sdk.LongJobInventory
+import org.zstack.sdk.SystemTagInventory
 import org.zstack.storage.primary.local.LocalStorageKvmBackend
 import org.zstack.test.integration.kvm.KvmTest
 import org.zstack.testlib.EnvSpec
@@ -222,7 +224,11 @@ class AddHostCase extends SubCase {
     }
 
     void testInnerAddHostMsg() {
-        env.afterSimulator(KVM_HOST_FACT_PATH) { HostFactResponse rsp -> rsp }
+        String distribution = null
+        env.afterSimulator(KVM_HOST_FACT_PATH) { HostFactResponse rsp ->
+            distribution = rsp.osDistribution
+            return rsp
+        }
 
         AddKVMHostMsg amsg = new AddKVMHostMsg()
         amsg.accountUuid = loginAsAdmin().accountUuid
@@ -236,6 +242,18 @@ class AddHostCase extends SubCase {
         bus.makeLocalServiceId(amsg, HostConstant.SERVICE_ID)
         AddHostReply reply = (AddHostReply) bus.call(amsg)
         assert reply.inventory.status == HostStatus.Connected.toString()
+
+        // For compatibility.
+        // OS system tag is deprecated, check os version with KVMHostVO soon.
+        def tags = querySystemTag {
+            delegate.conditions = [
+                    "resourceUuid=${reply.inventory.uuid}",
+                    "tag=os::distribution::${distribution}"
+            ]
+        } as List<SystemTagInventory>
+        assert tags.size() == 1
+
+        assert (reply.inventory as KVMHostInventory).osDistribution == distribution
     }
 
     void testGetHypervisorTypes() {