From dc29e3d9ee80d0651076391fe41d263cbb9d6117 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Mon, 8 Nov 2021 14:22:40 +0800 Subject: [PATCH] fix(region): sync cloudpods metadata --- pkg/apis/cloudcommon/db/metadata.go | 8 +++++--- pkg/apis/const.go | 4 ++++ pkg/multicloud/tag_base.go | 9 ++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkg/apis/cloudcommon/db/metadata.go b/pkg/apis/cloudcommon/db/metadata.go index e9803a3716..26294fe172 100644 --- a/pkg/apis/cloudcommon/db/metadata.go +++ b/pkg/apis/cloudcommon/db/metadata.go @@ -14,8 +14,10 @@ package db +import "yunion.io/x/onecloud/pkg/apis" + const ( - CLOUD_TAG_PREFIX = "ext:" - USER_TAG_PREFIX = "user:" - SYS_CLOUD_TAG_PREFIX = "sys:" + CLOUD_TAG_PREFIX = apis.CLOUD_TAG_PREFIX + USER_TAG_PREFIX = apis.USER_TAG_PREFIX + SYS_CLOUD_TAG_PREFIX = apis.SYS_CLOUD_TAG_PREFIX ) diff --git a/pkg/apis/const.go b/pkg/apis/const.go index b5253bfc41..8207381e79 100644 --- a/pkg/apis/const.go +++ b/pkg/apis/const.go @@ -52,6 +52,10 @@ const ( STATUS_UNKNOWN = "unknown" STATUS_CREATING = "creating" STATUS_CREATE_FAILED = "create_failed" + + CLOUD_TAG_PREFIX = "ext:" + USER_TAG_PREFIX = "user:" + SYS_CLOUD_TAG_PREFIX = "sys:" ) var ( diff --git a/pkg/multicloud/tag_base.go b/pkg/multicloud/tag_base.go index 210899bf78..374adeb3bf 100644 --- a/pkg/multicloud/tag_base.go +++ b/pkg/multicloud/tag_base.go @@ -19,6 +19,7 @@ import ( "yunion.io/x/pkg/errors" + "yunion.io/x/onecloud/pkg/apis" "yunion.io/x/onecloud/pkg/cloudprovider" ) @@ -378,7 +379,13 @@ type CloudpodsTags struct { } func (self *CloudpodsTags) GetTags() (map[string]string, error) { - return self.Metadata, nil + metadatas := map[string]string{} + for k, v := range self.Metadata { + if strings.HasPrefix(k, apis.USER_TAG_PREFIX) { + metadatas[strings.TrimPrefix(k, apis.USER_TAG_PREFIX)] = v + } + } + return metadatas, nil } func (self *CloudpodsTags) GetSysTags() map[string]string {