From bdfbaf052f26f2945885ec14ec044d6f1ecb74fa Mon Sep 17 00:00:00 2001
From: Qu Xuan <quxuan@yunionyun.com>
Date: Fri, 1 Nov 2019 17:47:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E9=95=9C=E5=83=8Fvers?=
 =?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/multicloud/aliyun/image.go | 3 ++-
 pkg/multicloud/huawei/image.go | 3 ++-
 pkg/multicloud/qcloud/image.go | 3 ++-
 pkg/multicloud/zstack/image.go | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkg/multicloud/aliyun/image.go b/pkg/multicloud/aliyun/image.go
index 0f943dc372..727b92f879 100644
--- a/pkg/multicloud/aliyun/image.go
+++ b/pkg/multicloud/aliyun/image.go
@@ -28,6 +28,7 @@ import (
 
 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/util/imagetools"
 )
 
 type ImageStatusType string
@@ -189,7 +190,7 @@ func (self *SImage) GetOsDist() string {
 }
 
 func (self *SImage) GetOsVersion() string {
-	return ""
+	return imagetools.NormalizeImageInfo(self.OSName, "", "", "", "").OsVersion
 }
 
 func (self *SImage) GetOsArch() string {
diff --git a/pkg/multicloud/huawei/image.go b/pkg/multicloud/huawei/image.go
index cb90da1f15..b71835a847 100644
--- a/pkg/multicloud/huawei/image.go
+++ b/pkg/multicloud/huawei/image.go
@@ -25,6 +25,7 @@ import (
 
 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/util/imagetools"
 )
 
 type TImageOwnerType string
@@ -165,7 +166,7 @@ func (self *SImage) GetOsDist() string {
 }
 
 func (self *SImage) GetOsVersion() string {
-	return self.OSVersion
+	return imagetools.NormalizeImageInfo(self.ImageSourceType, "", "", "", "").OsVersion
 }
 
 func (self *SImage) GetOsArch() string {
diff --git a/pkg/multicloud/qcloud/image.go b/pkg/multicloud/qcloud/image.go
index 276c72a056..a1371f6a70 100644
--- a/pkg/multicloud/qcloud/image.go
+++ b/pkg/multicloud/qcloud/image.go
@@ -27,6 +27,7 @@ import (
 
 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/util/imagetools"
 )
 
 type ImageStatusType string
@@ -195,7 +196,7 @@ func (self *SImage) GetOsDist() string {
 }
 
 func (self *SImage) GetOsVersion() string {
-	return ""
+	return imagetools.NormalizeImageInfo(self.OsName, "", "", "", "").OsVersion
 }
 
 func (self *SImage) GetOsArch() string {
diff --git a/pkg/multicloud/zstack/image.go b/pkg/multicloud/zstack/image.go
index e85cceba2c..b18b7685e9 100644
--- a/pkg/multicloud/zstack/image.go
+++ b/pkg/multicloud/zstack/image.go
@@ -167,7 +167,7 @@ func (image *SImage) GetOsDist() string {
 }
 
 func (image *SImage) GetOsVersion() string {
-	return ""
+	return imagetools.NormalizeImageInfo(image.Name, "", "", "", "").OsVersion
 }
 
 func (image *SImage) GetOsArch() string {